diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-09-23 15:51:42 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-09-23 15:51:42 +0300 |
| commit | c61cb0e0765915d7ad2d9e91f6f72dfcea662744 (patch) | |
| tree | d6667a7b8021640c74a096a566e6fdad99b01e03 /source/blender/editors/physics | |
| parent | 1e89a261b2482bdc1579fa730b3a00beda5fffad (diff) | |
Particle: Prevent crash duplicating hair on objects with modifiers
Diffstat (limited to 'source/blender/editors/physics')
| -rw-r--r-- | source/blender/editors/physics/particle_object.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index 2462061c331..545042e1d84 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -1097,8 +1097,9 @@ static bool copy_particle_systems_to_object(Scene *scene, Object *ob_from, Parti BLI_assert(false); break; } - - remap_hair_emitter(scene, ob_from, psys_from, ob_to, psys, psys->edit, from_mat, to_mat, psys_from->flag & PSYS_GLOBAL_HAIR, psys->flag & PSYS_GLOBAL_HAIR); + if (ob_from != ob_to) { + remap_hair_emitter(scene, ob_from, psys_from, ob_to, psys, psys->edit, from_mat, to_mat, psys_from->flag & PSYS_GLOBAL_HAIR, psys->flag & PSYS_GLOBAL_HAIR); + } /* tag for recalc */ // psys->recalc |= PSYS_RECALC_RESET; |