[Bf-blender-cvs] [c61cb0e] master: Particle: Prevent crash duplicating hair on objects with modifiers

[Sergey Sharybin]

Commit: c61cb0e0765915d7ad2d9e91f6f72dfcea662744
Author: Sergey Sharybin
Date:   Fri Sep 23 14:51:42 2016 +0200
Branches: master
https://developer.blender.org/rBc61cb0e0765915d7ad2d9e91f6f72dfcea662744

Particle: Prevent crash duplicating hair on objects with modifiers

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

M	source/blender/editors/physics/particle_object.c

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

diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c
index 2462061..545042e 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;