svn merge ^/trunk/blender -r42617:42655

3 files changed, 20 insertions, 19 deletions

diff --git a/source/gameengine/Converter/BL_SkinDeformer.cpp b/source/gameengine/Converter/BL_SkinDeformer.cpp
index 0c4806f4bd8..f320df12078 100644
--- a/source/gameengine/Converter/BL_SkinDeformer.cpp
+++ b/source/gameengine/Converter/BL_SkinDeformer.cpp
@@ -237,12 +237,12 @@ void BL_SkinDeformer::BGEDeformVerts()
 		}
 	}
 
+	MDeformVert *dv= dverts;
 
-	for (int i=0; i<m_bmesh->totvert; ++i)
+	for (int i=0; i<m_bmesh->totvert; ++i, dv++)
 	{
 		float contrib = 0.f, weight, max_weight=0.f;
 		bPoseChannel *pchan=NULL;
-		MDeformVert *dvert;
 		Eigen::Map<Eigen::Vector3f> norm(m_transnors[i]);
 		Eigen::Vector4f vec(0, 0, 0, 1);
 		Eigen::Matrix4f norm_chan_mat;
@@ -251,18 +251,18 @@ void BL_SkinDeformer::BGEDeformVerts()
 							m_transverts[i][2],
 							1.f);
 
-		dvert = dverts+i;
-
-		if (!dvert->totweight)
+		if (!dv->totweight)
 			continue;
 
-		for (int j=0; j<dvert->totweight; ++j)
+		MDeformWeight *dw= dv->dw;
+
+		for (unsigned int j= dv->totweight; j != 0; j--, dw++)
 		{
-			int index = dvert->dw[j].def_nr;
+			const int index = dw->def_nr;
 
 			if (index < defbase_tot && (pchan=m_dfnrToPC[index]))
 			{
-				weight = dvert->dw[j].weight;
+				weight = dw->weight;
 
 				if (weight)
 				{
diff --git a/source/gameengine/Rasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/CMakeLists.txt
index 08264ce8a67..ddc72c08ea1 100644
--- a/source/gameengine/Rasterizer/CMakeLists.txt
+++ b/source/gameengine/Rasterizer/CMakeLists.txt
@@ -29,6 +29,7 @@ set(INC
 	../Ketsji
 	../SceneGraph
 	../../blender/makesdna
+	../../blender/blenkernel
 	../../../intern/container
 	../../../intern/guardedalloc
 	../../../intern/moto/include
diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.cpp b/source/gameengine/Rasterizer/RAS_MeshObject.cpp
index 48e9e93b80e..afa62a9a8c6 100644
--- a/source/gameengine/Rasterizer/RAS_MeshObject.cpp
+++ b/source/gameengine/Rasterizer/RAS_MeshObject.cpp
@@ -43,6 +43,10 @@
 
 #include <algorithm>
 
+extern "C" {
+#	include "BKE_deform.h"
+}
+
 /* polygon sorting */
 
 struct RAS_MeshObject::polygonSlot
@@ -573,8 +577,8 @@ void RAS_MeshObject::CheckWeightCache(Object* obj)
 {
 	KeyBlock *kb;
 	int kbindex, defindex;
-	MDeformVert *dvert= NULL;
-	int totvert, i, j;
+	MDeformVert *dv= NULL;
+	int totvert, i;
 	float *weights;
 
 	if (!m_mesh->key)
@@ -598,19 +602,15 @@ void RAS_MeshObject::CheckWeightCache(Object* obj)
 				kb->weights = NULL;
 			}
 
-			dvert= m_mesh->dvert;
+			dv= m_mesh->dvert;
 			totvert= m_mesh->totvert;
 		
-			weights= (float*)MEM_callocN(totvert*sizeof(float), "weights");
+			weights= (float*)MEM_mallocN(totvert*sizeof(float), "weights");
 		
-			for (i=0; i < totvert; i++, dvert++) {
-				for(j=0; j<dvert->totweight; j++) {
-					if (dvert->dw[j].def_nr == defindex) {
-						weights[i]= dvert->dw[j].weight;
-						break;
-					}
-				}
+			for (i=0; i < totvert; i++, dv++) {
+				weights[i]= defvert_find_weight(dv, defindex);
 			}
+
 			kb->weights = weights;
 			m_cacheWeightIndex[kbindex] = defindex;
 		}