Particle system parenting

[blender-staging.git] / source / blender / editors / space_view3d / drawobject.c

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index a67e8c8a1c32c9d039bc7bdc350f4da7778840f0..42da6775d5fc837d5e9e63e1737e439290ce17f9 100644 (file)
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -3239,6 +3239,9 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
                        if(draw_as!=PART_DRAW_PATH){
                                state.time=cfra;
                                if(psys_get_particle_state(scene,ob,psys,a,&state,0)){
+                                       if(psys->parent)
+                                               Mat4MulVecfl(psys->parent->obmat, state.co);
+
                                        /* create actiual particle data */
                                        switch(draw_as){
                                                case PART_DRAW_DOT: