[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15280] trunk/blender/source/gameengine/ Converter: BGE bug fix for new shape action: mesh with multiple materials did not deform properly

[Benoit Bolsee]

Revision: 15280
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15280
Author:   ben2610
Date:     2008-06-19 16:40:46 +0200 (Thu, 19 Jun 2008)

Log Message:
-----------
BGE bug fix for new shape action: mesh with multiple materials did not deform properly

Modified Paths:
--------------
    trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp
    trunk/blender/source/gameengine/Converter/BL_SkinDeformer.cpp

Modified: trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp	2008-06-19 13:41:06 UTC (rev 15279)
+++ trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp	2008-06-19 14:40:46 UTC (rev 15280)
@@ -118,7 +118,9 @@
 		for (int v =0; v<m_bmesh->totvert; v++)
 			VECCOPY(m_transverts[v], m_bmesh->mvert[v].co);
 
+#ifdef __NLA_DEFNORMALS
 		RecalcNormals();
+#endif
 		bSkinUpdate = true;
 	}
 	return bSkinUpdate;

Modified: trunk/blender/source/gameengine/Converter/BL_SkinDeformer.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_SkinDeformer.cpp	2008-06-19 13:41:06 UTC (rev 15279)
+++ trunk/blender/source/gameengine/Converter/BL_SkinDeformer.cpp	2008-06-19 14:40:46 UTC (rev 15280)
@@ -108,9 +108,7 @@
 	MT_Point3 pt;
 //	float co[3];
 
-	if (!Update())
-		// no need to update the cache
-		return false;
+	Update();
 
 	array = m_pMeshObject->GetVertexCache(mat);
 	mvarray = m_pMeshObject->GetMVertCache(mat);