[Bf-blender-cvs] [0a76be8] master: cleanup: redundant call to BKE_object_apply_mat4

[Bastien Montagne]

Commit: 0a76be81b73eb5d0060845c2467fcecb986fb77e
Author: Bastien Montagne
Date:   Mon Dec 29 13:04:46 2014 +1100
Branches: master
https://developer.blender.org/rB0a76be81b73eb5d0060845c2467fcecb986fb77e

cleanup: redundant call to BKE_object_apply_mat4

===================================================================

M	source/blender/blenkernel/intern/object.c

===================================================================

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index a0d1b25..1676f22 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -2534,17 +2534,16 @@ void BKE_object_apply_mat4(Object *ob, float mat[4][4], const bool use_compat, c
 		mul_m4_m4m4(diff_mat, parent_mat, ob->parentinv);
 		invert_m4_m4(imat, diff_mat);
 		mul_m4_m4m4(rmat, imat, mat); /* get the parent relative matrix */
-		BKE_object_apply_mat4(ob, rmat, use_compat, false);
 
 		/* same as below, use rmat rather than mat */
 		mat4_to_loc_rot_size(ob->loc, rot, ob->size, rmat);
-		BKE_object_mat3_to_rot(ob, rot, use_compat);
 	}
 	else {
 		mat4_to_loc_rot_size(ob->loc, rot, ob->size, mat);
-		BKE_object_mat3_to_rot(ob, rot, use_compat);
 	}
 
+	BKE_object_mat3_to_rot(ob, rot, use_compat);
+
 	sub_v3_v3(ob->loc, ob->dloc);
 
 	if (ob->dscale[0] != 0.0f) ob->size[0] /= ob->dscale[0];