Adds importing blender material.

diff --git a/code/BlenderScene.h b/code/BlenderScene.h
index 051b54e..c1e0e47 100644 (file)
--- a/code/BlenderScene.h
+++ b/code/BlenderScene.h
@@ -246,6 +246,7 @@ struct MDeformVert : ElemBase  {
 struct Material : ElemBase {
     ID id FAIL;
 
+    short flag;
     float r,g,b WARN;
     float specr,specg,specb WARN;
     short har;

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a6c00dd..0656b9b 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Open Asset Import Library (assimp)
 # ----------------------------------------------------------------------
-# 
+#
 # Copyright (c) 2006-2016, assimp team
 # All rights reserved.
 #
@@ -54,6 +54,9 @@ SOURCE_GROUP( unit FILES
 
 SET( TEST_SRCS
   unit/AssimpAPITest.cpp
+  unit/utBlendImportMaterials.cpp
+  unit/utColladaExportCamera.cpp
+  unit/utColladaExportLight.cpp
   unit/utFastAtof.cpp
   unit/utFindDegenerates.cpp
   unit/utFindInvalidData.cpp
@@ -62,6 +65,7 @@ SET( TEST_SRCS
   unit/utImporter.cpp
   unit/utImproveCacheLocality.cpp
   unit/utIOSystem.cpp
+  unit/utIssues.cpp
   unit/utJoinVertices.cpp
   unit/utLimitBoneWeights.cpp
   unit/utMaterialSystem.cpp
@@ -79,9 +83,6 @@ SET( TEST_SRCS
   unit/utTextureTransform.cpp
   unit/utTriangulate.cpp
   unit/utVertexTriangleAdjacency.cpp
-  unit/utColladaExportCamera.cpp
-  unit/utColladaExportLight.cpp
-  unit/utIssues.cpp
 )
 
 SOURCE_GROUP( tests FILES  ${TEST_SRCS} )