diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-01-06 22:20:50 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-01-06 22:20:50 +0300 |
commit | 31e6978066fcea3e65b187f055fdffb8da5731f9 (patch) | |
tree | b8dfe81d6f93183e37cb5bfdfb16318ca4e7877b /source/blender/modifiers/intern/MOD_particlesystem.c | |
parent | 4acf0f05a1ec0b96c4a2e9c3628190f52a3590e2 (diff) |
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...
Diffstat (limited to 'source/blender/modifiers/intern/MOD_particlesystem.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_particlesystem.c | 7 |
1 files changed, 6 insertions, 1 deletions
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); } |