Cleanup: only use r_ prefix for return args
authorCampbell Barton <ideasman42@gmail.com>
Wed, 11 May 2016 18:36:16 +0000 (04:36 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 11 May 2016 18:36:16 +0000 (04:36 +1000)
source/blender/blenlib/intern/BLI_kdopbvh.c
source/blender/editors/armature/editarmature_sketch.c

index 5f64c137ce66ae5491dbfb5104d218c009fe8eea..6cef1924e332ef21e32bc2dfa10f2b1c9647aea8 100644 (file)
@@ -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;
 
index 7685829db9b36b7308fa7f35912a6b20a7c59af2..5530e293eddeafb55e34e1f307e6feb97fd0bf15 100644 (file)
@@ -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;
                        }