diff options
author | Campbell Barton <ideasman42@gmail.com> | 2016-05-11 21:36:16 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2016-05-11 21:36:16 +0300 |
commit | 5d93836a61284dbe1874ccf181e2bd6e9983a0de (patch) | |
tree | 37ef55d9db26f62c75199bd4a0283267a6d5c21d | |
parent | fbbac6807a9234b01c06c97850792efc0ca41880 (diff) |
Cleanup: only use r_ prefix for return args
-rw-r--r-- | source/blender/blenlib/intern/BLI_kdopbvh.c | 2 | ||||
-rw-r--r-- | source/blender/editors/armature/editarmature_sketch.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c index 5f64c137ce6..6cef1924e33 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 7685829db9b..5530e293edd 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; } |