[Bf-blender-cvs] [5d93836] master: Cleanup: only use r_ prefix for return args

[Campbell Barton]

Commit: 5d93836a61284dbe1874ccf181e2bd6e9983a0de
Author: Campbell Barton
Date:   Thu May 12 04:36:16 2016 +1000
Branches: master
https://developer.blender.org/rB5d93836a61284dbe1874ccf181e2bd6e9983a0de

Cleanup: only use r_ prefix for return args

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

M	source/blender/blenlib/intern/BLI_kdopbvh.c
M	source/blender/editors/armature/editarmature_sketch.c

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

diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c
index 5f64c13..6cef192 100644
--- a/source/blender/blenlib/intern/BLI_kdopbvh.c
+++ b/source/blender/blenlib/intern/BLI_kdopbvh.c
@@ -1573,7 +1573,7 @@ int BLI_bvhtree_find_nearest(
 
 
 /* Determines the distance that the ray must travel to hit the bounding volume of the given node */
-static float ray_nearest_hit(BVHRayCastData *data, const float bv[6])
+static float ray_nearest_hit(const BVHRayCastData *data, const float bv[6])
 {
 	int i;
 
diff --git a/source/blender/editors/armature/editarmature_sketch.c b/source/blender/editors/armature/editarmature_sketch.c
index 7685829..5530e29 100644
--- a/source/blender/editors/armature/editarmature_sketch.c
+++ b/source/blender/editors/armature/editarmature_sketch.c
@@ -975,19 +975,19 @@ static int sk_getStrokeSnapPoint(bContext *C, SK_Point *pt, SK_Sketch *sketch, S
 	        CTX_wm_region(C), CTX_wm_view3d(C));
 
 	float mvalf[2] = {UNPACK2(dd->mval)};
-	float r_loc[3], dummy_no[3];
+	float loc[3], dummy_no[3];
 
 	if (ts->snap_mode == SCE_SNAP_MODE_VOLUME) {
 		float size;
 		if (peelObjectsSnapContext(
 		        snap_context, mvalf, SNAP_ALL,
 		        (ts->snap_flag & SCE_SNAP_PEEL_OBJECT) != 0,
-		        r_loc, dummy_no, &size))
+		        loc, dummy_no, &size))
 		{
 			pt->type = dd->type;
 			pt->mode = PT_SNAP;
 			pt->size = size / 2;
-			copy_v3_v3(pt->p, r_loc);
+			copy_v3_v3(pt->p, loc);
 
 			point_added = 1;
 		}
@@ -1022,11 +1022,11 @@ static int sk_getStrokeSnapPoint(bContext *C, SK_Point *pt, SK_Sketch *sketch, S
 			            .snap_to = ts->snap_mode,
 			        },
 			        mvalf, &dist_px, NULL,
-			        r_loc, dummy_no))
+			        loc, dummy_no))
 			{
 				pt->type = dd->type;
 				pt->mode = PT_SNAP;
-				copy_v3_v3(pt->p, r_loc);
+				copy_v3_v3(pt->p, loc);
 
 				point_added = 1;
 			}