diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2010-09-08 15:08:34 +0400 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2010-09-08 15:08:34 +0400 |
| commit | f0fe8a559da30900422dc77c2d0ebaf267eba90b (patch) | |
| tree | d857811339f74081a7787d66390eba80532379e5 /source | |
| parent | 128bd96c017d5ed3355023a4c79f11813f48468e (diff) | |
Partial fix for [#23714] Linked instance group with particles doesn't render properly
* Only partial because rendering of dupliobjects / groups with particles isn't yet fully implemented
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index dbe982c48e0..0d14c3cb9f6 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -4077,7 +4077,8 @@ void particle_system_update(Scene *scene, Object *ob, ParticleSystem *psys) psys->cfra = cfra; psys->recalc = 0; - /* save matrix for duplicators */ - invert_m4_m4(psys->imat, ob->obmat); + /* save matrix for duplicators, at rendertime the actual dupliobject's matrix is used so don't update! */ + if(psys->renderdata==0) + invert_m4_m4(psys->imat, ob->obmat); } |