[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50041] branches/soc-2012-bratwurst/source /blender/assimp/MeshImporter.cpp: - bf_assimp: fix assign_material regression

Alexander Gessler alexander.gessler at gmx.net
Mon Aug 20 14:41:46 CEST 2012


Revision: 50041
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50041
Author:   aramis_acg
Date:     2012-08-20 12:41:46 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
- bf_assimp: fix assign_material regression 

Modified Paths:
--------------
    branches/soc-2012-bratwurst/source/blender/assimp/MeshImporter.cpp

Modified: branches/soc-2012-bratwurst/source/blender/assimp/MeshImporter.cpp
===================================================================
--- branches/soc-2012-bratwurst/source/blender/assimp/MeshImporter.cpp	2012-08-20 10:57:51 UTC (rev 50040)
+++ branches/soc-2012-bratwurst/source/blender/assimp/MeshImporter.cpp	2012-08-20 12:41:46 UTC (rev 50041)
@@ -120,7 +120,7 @@
 
 	// assign materials
 	for (size_t i = 0; i < reverseMatIDs.size(); ++i) {
-		assign_material(ob,scene_imp.get_material(reverseMatIDs[i]).get_material(),ob->totcol + 1);
+		assign_material(ob,scene_imp.get_material(reverseMatIDs[i]).get_material(),ob->totcol + 1, BKE_MAT_ASSIGN_OBDATA);
 	}
 
 	return ob;




More information about the Bf-blender-cvs mailing list