[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16730] trunk/blender/source/blender/ blenkernel/intern/particle_system.c: Fix for [#17677] Blender Crash when Baking Boids

[Janne Karhu]

Revision: 16730
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16730
Author:   jhk
Date:     2008-09-25 20:31:01 +0200 (Thu, 25 Sep 2008)

Log Message:
-----------
Fix for [#17677] Blender Crash when Baking Boids
- A check for getting the "better" dm was missing from the boids code. I plan on converting the boids code into using the collision modifier one of these days but hopefully this quick fix will do for now.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/particle_system.c

Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c	2008-09-25 18:02:15 UTC (rev 16729)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2008-09-25 18:31:01 UTC (rev 16730)
@@ -3319,7 +3319,9 @@
 			else{
 				psys_disable_all(ob);
 
-				dm=mesh_get_derived_deform(ob,0);
+				dm=mesh_get_derived_final(ob,0);
+				if(dm==0)
+					mesh_get_derived_deform(ob,0);
 
 				psys_enable_all(ob);
 			}