[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47970] branches/soc-2012-bratwurst/source /blender/assimp: - bf_assimp: set MA_VERTEXCOLP flag when vertcols are present.

[Alexander Gessler]

Revision: 47970
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47970
Author:   aramis_acg
Date:     2012-06-15 16:11:02 +0000 (Fri, 15 Jun 2012)
Log Message:
-----------
- bf_assimp: set MA_VERTEXCOLP flag when vertcols are present.

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

Modified: branches/soc-2012-bratwurst/source/blender/assimp/MaterialImporter.cpp
===================================================================
--- branches/soc-2012-bratwurst/source/blender/assimp/MaterialImporter.cpp	2012-06-15 16:09:21 UTC (rev 47969)
+++ branches/soc-2012-bratwurst/source/blender/assimp/MaterialImporter.cpp	2012-06-15 16:11:02 UTC (rev 47970)
@@ -152,6 +152,13 @@
 }
 
 
+void MaterialImporter::set_vertex_color_flag() const
+{
+	assert(mat != NULL);
+	mat->mode |= MA_VERTEXCOLP;
+}
+
+
 float MaterialImporter::luminance(float r, float g, float b) const
 {
 	return 0.2126f *r + 0.7152f *g + 0.0722f * b;

Modified: branches/soc-2012-bratwurst/source/blender/assimp/MaterialImporter.h
===================================================================
--- branches/soc-2012-bratwurst/source/blender/assimp/MaterialImporter.h	2012-06-15 16:09:21 UTC (rev 47969)
+++ branches/soc-2012-bratwurst/source/blender/assimp/MaterialImporter.h	2012-06-15 16:11:02 UTC (rev 47970)
@@ -90,6 +90,9 @@
 
 	// disown the converted material (i.e. prevent deletion in constructor)
 	Material* disown_material();
+
+	// set MA_VERTCOLP flag - this is valid only after the conversion has been run
+	void set_vertex_color_flag() const;
 };
 
 }

Modified: branches/soc-2012-bratwurst/source/blender/assimp/MeshImporter.cpp
===================================================================
--- branches/soc-2012-bratwurst/source/blender/assimp/MeshImporter.cpp	2012-06-15 16:09:21 UTC (rev 47969)
+++ branches/soc-2012-bratwurst/source/blender/assimp/MeshImporter.cpp	2012-06-15 16:11:02 UTC (rev 47970)
@@ -452,6 +452,11 @@
 		if (matIDs.find(m.mMaterialIndex) == matIDs.end()) {
 			matIDs[m.mMaterialIndex] = reverseMatIDs.size();
 			reverseMatIDs.push_back(m.mMaterialIndex);
+
+			if (vc_count > 0)
+			{
+				scene_imp.get_material(m.mMaterialIndex).set_vertex_color_flag();
+			}
 		}
 
 		const short mat = static_cast<short>( matIDs[m.mMaterialIndex] );