[Bf-blender-cvs] [937c2d8] master: Followup fix for T43394: Reconnect feature was using identity matrix for transforming hair into world space, but this is already happining due to the global flag.

[Lukas Tönne]

Commit: 937c2d847368bbc7934440610639adeae67f2669
Author: Lukas Tönne
Date:   Tue Jan 27 17:49:34 2015 +0100
Branches: master
https://developer.blender.org/rB937c2d847368bbc7934440610639adeae67f2669

Followup fix for T43394: Reconnect feature was using identity matrix for
transforming hair into world space, but this is already happining due to
the global flag.

Still is a horrible mess, legacy code headache as always ...

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

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 95a0286..dba6d6f 100644
--- a/source/blender/editors/physics/particle_object.c
+++ b/source/blender/editors/physics/particle_object.c
@@ -849,14 +849,12 @@ static bool remap_hair_emitter(Scene *scene, Object *ob, ParticleSystem *psys,
 
 static bool connect_hair(Scene *scene, Object *ob, ParticleSystem *psys)
 {
-	float (*from_mat)[4] = psys->flag & PSYS_GLOBAL_HAIR ? I : ob->obmat;
-	float (*to_mat)[4] = ob->obmat;
 	bool ok;
 	
 	if (!psys)
 		return false;
 	
-	ok = remap_hair_emitter(scene, ob, psys, ob, psys, psys->edit, from_mat, to_mat, psys->flag & PSYS_GLOBAL_HAIR, false);
+	ok = remap_hair_emitter(scene, ob, psys, ob, psys, psys->edit, ob->obmat, ob->obmat, psys->flag & PSYS_GLOBAL_HAIR, false);
 	psys->flag &= ~PSYS_GLOBAL_HAIR;
 	
 	return ok;