Merging r42648 through r42722 from trunk into soc-2011-tomato
[blender.git] / source / blender / editors / space_view3d / drawobject.c
index 21ac4e1431ff8bdd75a82994c1ff1723a49beb1d..e3e551d67ee5ca2756ccd84ba3ce934335ef2e32 100644 (file)
@@ -4050,7 +4050,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 
        if( (base->flag & OB_FROMDUPLI) && (ob->flag & OB_FROMGROUP) ) {
                float mat[4][4];
-               mul_m4_m4m4(mat, psys->imat, ob->obmat);
+               mult_m4_m4m4(mat, ob->obmat, psys->imat);
                glMultMatrixf(mat);
        }