[Bf-blender-cvs] [31e6978] master: Fix (unreported) crash when rendering hairs from edit mode (own regression in recent particle edit fix).

[Bastien Montagne]

Commit: 31e6978066fcea3e65b187f055fdffb8da5731f9
Author: Bastien Montagne
Date:   Wed Jan 6 20:20:50 2016 +0100
Branches: master
https://developer.blender.org/rB31e6978066fcea3e65b187f055fdffb8da5731f9

Fix (unreported) crash when rendering hairs from edit mode (own regression in recent particle edit fix).

*sigh* hope we fix some day that recursion issue that makes it such a PITA to generate DM of other targets from DM stack...

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

M	source/blender/modifiers/intern/MOD_particlesystem.c

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

diff --git a/source/blender/modifiers/intern/MOD_particlesystem.c b/source/blender/modifiers/intern/MOD_particlesystem.c
index 6b2b999..79730b5 100644
--- a/source/blender/modifiers/intern/MOD_particlesystem.c
+++ b/source/blender/modifiers/intern/MOD_particlesystem.c
@@ -162,7 +162,12 @@ static void deformVerts(ModifierData *md, Object *ob,
 	if (!psmd->dm_final->deformedOnly) {
 		/* XXX Think we can assume here that if current DM is not only-deformed, ob->deformedOnly has been set.
 		 *     This is awfully weak though. :| */
-		psmd->dm_deformed = CDDM_copy(ob->derivedDeform);
+		dm = ob->derivedDeform;
+		if (!dm) {
+			/* Can happen, e.g. when rendering from Edit mode... */
+			dm = get_dm(ob, NULL, NULL, vertexCos, false, true);
+		}
+		psmd->dm_deformed = CDDM_copy(dm);
 		DM_ensure_tessface(psmd->dm_deformed);
 	}