diff options
author | Janne Karhu <jhkarh@gmail.com> | 2011-08-18 06:12:23 +0400 |
---|---|---|
committer | Janne Karhu <jhkarh@gmail.com> | 2011-08-18 06:12:23 +0400 |
commit | 591b087204b1bc9372d8c87d5bdf28a55f3ae13a (patch) | |
tree | 7c7b0fca0ffdc6ff8181b4293da2cfa0fcdda19d /source/blender/blenkernel | |
parent | 5c20bc02ff76a3a72992bc43f414b673e8275866 (diff) |
Fix for [#28216] particles objects rotation still wrong with r39287
* The emitter object's inverse matrix wasn't in global coordinates during rendering, so the surface normals of the hair emission locations were transformed with the wrong matrix.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/anim.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index 8aa816f9cb5..ebe7325d96a 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -1245,6 +1245,8 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Scene *scene, Object *p sim.ob= par; sim.psys= psys; sim.psmd= psys_get_modifier(par, psys); + /* make sure emitter imat is in global coordinates instead of render view coordinates */ + invert_m4_m4(par->imat, par->obmat); /* first check for loops (particle system object used as dupli object) */ if(part->ren_as == PART_DRAW_OB) { |