[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60306] branches/soc-2013-rigid_body_sim/ source/blender/blenkernel/intern/rigidbody.c: rigidbody: Abort mesh shape creation when we can't get a derived mesh

[Sergej Reich]

Revision: 60306
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60306
Author:   sergof
Date:     2013-09-22 09:02:38 +0000 (Sun, 22 Sep 2013)
Log Message:
-----------
rigidbody: Abort mesh shape creation when we can't get a derived mesh

Would only assert before, now just return.

Thanks to Thomas Beck (plasmasolutions) for report.

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 06:48:57 UTC (rev 60305)
+++ branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/rigidbody.c	2013-09-22 09:02:38 UTC (rev 60306)
@@ -300,7 +300,9 @@
 		}
 
 		/* ensure mesh validity, then grab data */
-		BLI_assert(dm!= NULL); // RB_TODO need to make sure there's no case where deform derived mesh doesn't exist
+		if (dm == NULL)
+			return NULL;
+
 		DM_ensure_tessface(dm);
 
 		mvert   = (dm) ? dm->getVertArray(dm) : NULL;