Merge branch 'master' into pbr-obj
No related branches found
No related tags found
Showing
- CMakeLists.txt 2 additions, 2 deletionsCMakeLists.txt
- code/AssetLib/Blender/BlenderScene.cpp 5 additions, 2 deletionscode/AssetLib/Blender/BlenderScene.cpp
- code/AssetLib/FBX/FBXConverter.cpp 1 addition, 0 deletionscode/AssetLib/FBX/FBXConverter.cpp
- code/AssetLib/LWS/LWSLoader.cpp 5 additions, 0 deletionscode/AssetLib/LWS/LWSLoader.cpp
- code/AssetLib/MDL/MDLMaterialLoader.cpp 6 additions, 2 deletionscode/AssetLib/MDL/MDLMaterialLoader.cpp
- code/CMakeLists.txt 2 additions, 2 deletionscode/CMakeLists.txt
- code/Common/BaseImporter.cpp 5 additions, 1 deletioncode/Common/BaseImporter.cpp
- code/Common/DefaultProgressHandler.h 9 additions, 8 deletionscode/Common/DefaultProgressHandler.h
- code/Common/Importer.cpp 1 addition, 1 deletioncode/Common/Importer.cpp
- contrib/android-cmake/android.toolchain.cmake 1 addition, 0 deletionscontrib/android-cmake/android.toolchain.cmake
- include/assimp/ProgressHandler.hpp 1 addition, 0 deletionsinclude/assimp/ProgressHandler.hpp
- tools/assimp_cmd/Main.cpp 27 additions, 4 deletionstools/assimp_cmd/Main.cpp
Loading
Please register or sign in to comment