forked from bartvdbraak/blender
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 ...
This commit is contained in:
parent
3b50d3a04f
commit
937c2d8473
@ -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)
|
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;
|
bool ok;
|
||||||
|
|
||||||
if (!psys)
|
if (!psys)
|
||||||
return false;
|
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;
|
psys->flag &= ~PSYS_GLOBAL_HAIR;
|
||||||
|
|
||||||
return ok;
|
return ok;
|
||||||
|
Loading…
Reference in New Issue
Block a user