diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2009-06-21 15:09:16 +0400 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2009-06-21 15:09:16 +0400 |
| commit | 1f9368b37ec9a418cd8996ffd9ee24f4bd47b2dd (patch) | |
| tree | 8bdb6594c65e22a07a528d44090265f380bf404e /source/blender/render | |
| parent | c549e75c1690dd740540d1349593983ae6dd08d9 (diff) | |
Particle system parenting
* Allows moving, rotating & scaling of particle simulations.
* Setting in particle render options.
* Changes viewed & rendered particles from global space to parent space.
* Doesn't effect simulations at all.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 98e5819c0d3..8423b5d271c 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -1886,6 +1886,9 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem if(psys_get_particle_state(re->scene,ob,psys,a,&state,0)==0) continue; + if(psys->parent) + Mat4MulVecfl(psys->parent->obmat, state.co); + VECCOPY(loc,state.co); if(part->ren_as!=PART_DRAW_BB) MTC_Mat4MulVecfl(re->viewmat,loc); |