[Bf-blender-cvs] [d5588fd] master: Fix T40113: Skinned meshes with non-animated shape keys crashes the BGE.

Mitchell Stokes noreply at git.blender.org
Sat May 10 01:07:29 CEST 2014


Commit: d5588fd658dc0c776a33e55ccbfaed1a3974b396
Author: Mitchell Stokes
Date:   Fri May 9 16:05:23 2014 -0700
https://developer.blender.org/rBd5588fd658dc0c776a33e55ccbfaed1a3974b396

Fix T40113: Skinned meshes with non-animated shape keys crashes the BGE.

===================================================================

M	source/gameengine/Converter/BL_ShapeDeformer.cpp

===================================================================

diff --git a/source/gameengine/Converter/BL_ShapeDeformer.cpp b/source/gameengine/Converter/BL_ShapeDeformer.cpp
index b9b2732..5e31dab 100644
--- a/source/gameengine/Converter/BL_ShapeDeformer.cpp
+++ b/source/gameengine/Converter/BL_ShapeDeformer.cpp
@@ -129,7 +129,7 @@ bool BL_ShapeDeformer::LoadShapeDrivers(KX_GameObject* parent)
 	}
 
 	// Fix drivers since BL_ArmatureObject makes copies
-	if (parent->GetGameObjectType() == SCA_IObject::OBJ_ARMATURE) {
+	if (parent->GetGameObjectType() == SCA_IObject::OBJ_ARMATURE && GetKey()->adt) {
 		BL_ArmatureObject *arma = (BL_ArmatureObject*)parent;
 		FCurve *fcu;




More information about the Bf-blender-cvs mailing list