[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38525] branches/soc-2011-pepper/source/ gameengine/Ketsji/BL_Action.cpp: BGE Animations: Fixing a crash with "IPO" animations on an object with modifiers.

[Mitchell Stokes]

Revision: 38525
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38525
Author:   moguri
Date:     2011-07-20 06:20:49 +0000 (Wed, 20 Jul 2011)
Log Message:
-----------
BGE Animations: Fixing a crash with "IPO" animations on an object with 
modifiers.

Modified Paths:
--------------
    branches/soc-2011-pepper/source/gameengine/Ketsji/BL_Action.cpp

Modified: branches/soc-2011-pepper/source/gameengine/Ketsji/BL_Action.cpp
===================================================================
--- branches/soc-2011-pepper/source/gameengine/Ketsji/BL_Action.cpp     
2011-07-20 06:09:41 UTC (rev 38524)
+++ branches/soc-2011-pepper/source/gameengine/Ketsji/BL_Action.cpp     
2011-07-20 06:20:49 UTC (rev 38525)
@@ -155,7 +155,7 @@
                BL_DeformableGameObject *obj = (BL_DeformableGameObject*)m_obj;
                BL_ShapeDeformer *shape_deformer = 
dynamic_cast<BL_ShapeDeformer*>(obj->GetDeformer());
                
-               if (shape_deformer)
+               if (shape_deformer && shape_deformer->GetKey())
                {
                        obj->GetShape(m_blendinshape);
 
@@ -363,7 +363,7 @@
                BL_ShapeDeformer *shape_deformer = 
dynamic_cast<BL_ShapeDeformer*>(obj->GetDeformer());
 
                // Handle shape actions if we have any
-               if (shape_deformer)
+               if (shape_deformer && shape_deformer->GetKey())
                {
                        Key *key = shape_deformer->GetKey();
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs