diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-12-17 03:50:55 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-17 03:50:55 +0400 |
commit | db6cb30941da7899ccafa44c87c17970d134a2c9 (patch) | |
tree | 0f1c3df62346cfac61e2785e9ec7ac8e0e30f443 /source/blender/makesrna/intern/rna_object.c | |
parent | e5b1f9c28d52254fd11e226ed4ac7bf07d7259d7 (diff) | |
parent | 3311164b24da61f2967f96d0ee27508a7e2e0267 (diff) |
svn merge ^/trunk/blender -r42669:42670
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 650395fdc26..31f7f49aa80 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -175,7 +175,7 @@ static void rna_Object_matrix_local_get(PointerRNA *ptr, float values[16]) if(ob->parent) { float invmat[4][4]; /* for inverse of parent's matrix */ invert_m4_m4(invmat, ob->parent->obmat); - mul_m4_m4m4((float(*)[4])values, ob->obmat, invmat); + mult_m4_m4m4((float(*)[4])values, invmat, ob->obmat); } else { copy_m4_m4((float(*)[4])values, ob->obmat); @@ -192,7 +192,7 @@ static void rna_Object_matrix_local_set(PointerRNA *ptr, const float values[16]) if(ob->parent) { float invmat[4][4]; invert_m4_m4(invmat, ob->parentinv); - mul_m4_m4m4(ob->obmat, (float(*)[4])values, invmat); + mult_m4_m4m4(ob->obmat, invmat, (float(*)[4])values); } else { copy_m4_m4(ob->obmat, (float(*)[4])values); |