[Bf-blender-cvs] [b3690cdecd] master: Fix variable shadow and avoid calculating same value twice

[Sergey Sharybin]

Commit: b3690cdecde587119944b88da0259ec96d6fe1ec
Author: Sergey Sharybin
Date:   Tue Jan 31 11:55:29 2017 +0100
Branches: master
https://developer.blender.org/rBb3690cdecde587119944b88da0259ec96d6fe1ec

Fix variable shadow and avoid calculating same value twice

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

M	source/blender/editors/transform/transform_snap_object.c

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

diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c
index bed451a32d..d1bcec3961 100644
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@ -1117,12 +1117,13 @@ static bool snapDerivedMesh(
 		float depth_range_local[2];
 		if (ELEM(snapdata->snap_to, SCE_SNAP_MODE_VERTEX, SCE_SNAP_MODE_EDGE)) {
 			mul_m4_m4m4(lpmat, snapdata->pmat, obmat);
-			copy_v3_v3(ray_org_local, snapdata->ray_origin);
-			mul_m4_v3(imat, ray_org_local);
 			depth_range_local[0] = snapdata->depth_range[0] * local_scale;
 			depth_range_local[1] = local_depth + depth_range_local[0];
 		}
 
+		copy_v3_v3(ray_org_local, snapdata->ray_origin);
+		mul_m4_v3(imat, ray_org_local);
+
 		if (do_bb) {
 			BoundBox *bb = BKE_object_boundbox_get(ob);
 
@@ -1246,11 +1247,6 @@ static bool snapDerivedMesh(
 				 * because even in the Orthografic view, in some cases,
 				 * the ray can start inside the object (see T50486) */
 				if (len_diff > 400.0f) {
-					float ray_org_local[3];
-
-					copy_v3_v3(ray_org_local, snapdata->ray_origin);
-					mul_m4_v3(imat, ray_org_local);
-
 					/* We pass a temp ray_start, set from object's boundbox, to avoid precision issues with
 					 * very far away ray_start values (as returned in case of ortho view3d), see T38358.
 					 */