From 31e6978066fcea3e65b187f055fdffb8da5731f9 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 6 Jan 2016 20:20:50 +0100 Subject: 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... --- source/blender/modifiers/intern/MOD_particlesystem.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source/blender/modifiers') diff --git a/source/blender/modifiers/intern/MOD_particlesystem.c b/source/blender/modifiers/intern/MOD_particlesystem.c index 6b2b999d596..79730b5f7b2 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); } -- cgit v1.2.3