[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60307] branches/soc-2013-rigid_body_sim/ source/blender/blenkernel/intern/rigidbody.c: rigidbody: Don' t try to deform shapes if we don't have a derived mesh

[Sergej Reich]

Revision: 60307
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60307
Author:   sergof
Date:     2013-09-22 09:27:26 +0000 (Sun, 22 Sep 2013)
Log Message:
-----------
rigidbody: Don't try to deform shapes if we don't have a derived mesh

Modified Paths:
--------------
    branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/rigidbody.c

Modified: branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/rigidbody.c
===================================================================
--- branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/rigidbody.c	2013-09-22 09:02:38 UTC (rev 60306)
+++ branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/rigidbody.c	2013-09-22 09:27:26 UTC (rev 60307)
@@ -1201,11 +1201,13 @@
 
 	if (rbo->shape == RB_SHAPE_TRIMESH && rbo->flag & RBO_FLAG_USE_DEFORM) {
 		DerivedMesh *dm = ob->derivedDeform;
-		MVert *mvert = dm->getVertArray(dm);
-		int totvert = dm->getNumVerts(dm);
-		BoundBox *bb = BKE_object_boundbox_get(ob);
+		if (dm) {
+			MVert *mvert = dm->getVertArray(dm);
+			int totvert = dm->getNumVerts(dm);
+			BoundBox *bb = BKE_object_boundbox_get(ob);
 
-		RB_shape_trimesh_update(rbo->physics_shape, (float*)mvert, totvert, sizeof(MVert), bb->vec[0], bb->vec[6]);
+			RB_shape_trimesh_update(rbo->physics_shape, (float*)mvert, totvert, sizeof(MVert), bb->vec[0], bb->vec[6]);
+		}
 	}
 
 	if (rbo->type == RBO_TYPE_ACTIVE && rbo->activation_type == RBO_ACTIVATION_TIME)