Merge branch 'master' into coverity_scan

2016-11-18 11:38:45 +01:00
parent a3be51ecf3 46a022520f
commit cae8a172c3
206 changed files with 35283 additions and 11500 deletions
--- a/code/BlenderScene.cpp
+++ b/code/BlenderScene.cpp
@@ -805,5 +805,5 @@ void DNA::RegisterConverters() {
    converters["Image"] = DNA::FactoryPair( &Structure::Allocate<Image>, &Structure::Convert<Image> );
 }

+#endif // ASSIMP_BUILD_NO_BLEND_IMPORTER

-#endif //ASSIMP_BUILD_NO_BLEND_IMPORTER