svn merge ^/trunk/blender -r42669:42670

1 files changed, 10 insertions, 10 deletions

diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c
index 0d63c161ccc..82c9b0c4691 100644
--- a/source/blender/blenkernel/intern/anim.c
+++ b/source/blender/blenkernel/intern/anim.c
@@ -727,10 +727,10 @@ static void group_duplilist(ListBase *lb, Scene *scene, Object *ob, int level, i
 			if(!is_zero_v3(group->dupli_ofs)) {
 				copy_m4_m4(tmat, go->ob->obmat);
 				sub_v3_v3v3(tmat[3], tmat[3], group->dupli_ofs);
-				mul_m4_m4m4(mat, tmat, ob->obmat);
+				mult_m4_m4m4(mat, ob->obmat, tmat);
 			}
 			else {
-				mul_m4_m4m4(mat, go->ob->obmat, ob->obmat);
+				mult_m4_m4m4(mat, ob->obmat, go->ob->obmat);
 			}
 			
 			dob= new_dupli_object(lb, go->ob, mat, ob->lay, 0, OB_DUPLIGROUP, animated);
@@ -955,7 +955,7 @@ static void vertex_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, fl
 					   when par_space_mat is NULL ob->obmat can be used instead of ob__obmat
 					*/
 					if(par_space_mat)
-						mul_m4_m4m4(vdd.obmat, ob->obmat, par_space_mat);
+						mult_m4_m4m4(vdd.obmat, par_space_mat, ob->obmat);
 					else
 						copy_m4_m4(vdd.obmat, ob->obmat);
 
@@ -1085,7 +1085,7 @@ static void face_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, floa
 					   when par_space_mat is NULL ob->obmat can be used instead of ob__obmat
 					*/
 					if(par_space_mat)
-						mul_m4_m4m4(ob__obmat, ob->obmat, par_space_mat);
+						mult_m4_m4m4(ob__obmat, par_space_mat, ob->obmat);
 					else
 						copy_m4_m4(ob__obmat, ob->obmat);
 					
@@ -1403,15 +1403,15 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Scene *scene, Object *p
 					if(!is_zero_v3(part->dup_group->dupli_ofs)) {
 						copy_m4_m4(tmat, oblist[b]->obmat);
 						sub_v3_v3v3(tmat[3], tmat[3], part->dup_group->dupli_ofs);
-						mul_m4_m4m4(tmat, tmat, pamat);
+						mult_m4_m4m4(tmat, pamat, tmat);
 					}
 					else {
-						mul_m4_m4m4(tmat, oblist[b]->obmat, pamat);
+						mult_m4_m4m4(tmat, pamat, oblist[b]->obmat);
 					}
 
 					mul_mat3_m4_fl(tmat, size*scale);
 					if(par_space_mat)
-						mul_m4_m4m4(mat, tmat, par_space_mat);
+						mult_m4_m4m4(mat, par_space_mat, tmat);
 					else
 						copy_m4_m4(mat, tmat);
 
@@ -1442,15 +1442,15 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Scene *scene, Object *p
 				 * remove the real emitter's transformation before 2nd order duplication.
 				 */
 				if(par_space_mat && GS(id->name) != ID_GR)
-					mul_m4_m4m4(mat, pamat, psys->imat);
+					mult_m4_m4m4(mat, psys->imat, pamat);
 				else
 					copy_m4_m4(mat, pamat);
 
-				mul_m4_m4m4(tmat, obmat, mat);
+				mult_m4_m4m4(tmat, mat, obmat);
 				mul_mat3_m4_fl(tmat, size*scale);
 
 				if(par_space_mat)
-					mul_m4_m4m4(mat, tmat, par_space_mat);
+					mult_m4_m4m4(mat, par_space_mat, tmat);
 				else
 					copy_m4_m4(mat, tmat);