diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-27 19:49:34 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-27 19:51:21 +0300 |
| commit | 937c2d847368bbc7934440610639adeae67f2669 (patch) | |
| tree | 3399520d9ae9723254a3917b7953855f6a4255c5 /source/blender/editors/physics | |
| parent | 3b50d3a04f2c3b7202b935652a81a8888b47c84a (diff) | |
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 ...
Diffstat (limited to 'source/blender/editors/physics')
| -rw-r--r-- | source/blender/editors/physics/particle_object.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index 95a0286edc1..dba6d6f5085 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; |