Cleanup: use 'r_' prefix for return arguments

Also improve alignment.

1 files changed, 25 insertions, 25 deletions

diff --git a/source/blender/blenkernel/intern/anim_path.c b/source/blender/blenkernel/intern/anim_path.c
index 92b5bd345cf..56ff7d07809 100644
--- a/source/blender/blenkernel/intern/anim_path.c
+++ b/source/blender/blenkernel/intern/anim_path.c
@@ -205,11 +205,11 @@ static int interval_test(const int min, const int max, int p1, const int cycl)
  */
 bool where_on_path(Object *ob,
                    float ctime,
-                   float vec[4],
-                   float dir[3],
-                   float quat[4],
-                   float *radius,
-                   float *weight)
+                   float r_vec[4],
+                   float r_dir[3],
+                   float r_quat[4],
+                   float *r_radius,
+                   float *r_weight)
 {
   Curve *cu;
   Nurb *nu;
@@ -274,10 +274,10 @@ bool where_on_path(Object *ob,
 
   key_curve_tangent_weights(1.0f - fac, data, KEY_BSPLINE);
 
-  interp_v3_v3v3v3v3(dir, p0->vec, p1->vec, p2->vec, p3->vec, data);
+  interp_v3_v3v3v3v3(r_dir, p0->vec, p1->vec, p2->vec, p3->vec, data);
 
-  /* make compatible with vectoquat */
-  negate_v3(dir);
+  /* Make compatible with #vec_to_quat. */
+  negate_v3(r_dir);
   //}
 
   nurbs = BKE_curve_editNurbs_get(cu);
@@ -300,16 +300,16 @@ bool where_on_path(Object *ob,
     key_curve_position_weights(1.0f - fac, data, KEY_BSPLINE);
   }
 
-  vec[0] = data[0] * p0->vec[0] + data[1] * p1->vec[0] + data[2] * p2->vec[0] +
-           data[3] * p3->vec[0]; /* X */
-  vec[1] = data[0] * p0->vec[1] + data[1] * p1->vec[1] + data[2] * p2->vec[1] +
-           data[3] * p3->vec[1]; /* Y */
-  vec[2] = data[0] * p0->vec[2] + data[1] * p1->vec[2] + data[2] * p2->vec[2] +
-           data[3] * p3->vec[2]; /* Z */
-  vec[3] = data[0] * p0->vec[3] + data[1] * p1->vec[3] + data[2] * p2->vec[3] +
-           data[3] * p3->vec[3]; /* Tilt, should not be needed since we have quat still used */
+  r_vec[0] = /* X */
+      data[0] * p0->vec[0] + data[1] * p1->vec[0] + data[2] * p2->vec[0] + data[3] * p3->vec[0];
+  r_vec[1] = /* Y */
+      data[0] * p0->vec[1] + data[1] * p1->vec[1] + data[2] * p2->vec[1] + data[3] * p3->vec[1];
+  r_vec[2] = /* Z */
+      data[0] * p0->vec[2] + data[1] * p1->vec[2] + data[2] * p2->vec[2] + data[3] * p3->vec[2];
+  r_vec[3] = /* Tilt, should not be needed since we have quat still used */
+      data[0] * p0->vec[3] + data[1] * p1->vec[3] + data[2] * p2->vec[3] + data[3] * p3->vec[3];
 
-  if (quat) {
+  if (r_quat) {
     float totfac, q1[4], q2[4];
 
     totfac = data[0] + data[3];
@@ -330,21 +330,21 @@ bool where_on_path(Object *ob,
 
     totfac = data[0] + data[1] + data[2] + data[3];
     if (totfac > FLT_EPSILON) {
-      interp_qt_qtqt(quat, q1, q2, (data[1] + data[2]) / totfac);
+      interp_qt_qtqt(r_quat, q1, q2, (data[1] + data[2]) / totfac);
     }
     else {
-      copy_qt_qt(quat, q2);
+      copy_qt_qt(r_quat, q2);
     }
   }
 
-  if (radius) {
-    *radius = data[0] * p0->radius + data[1] * p1->radius + data[2] * p2->radius +
-              data[3] * p3->radius;
+  if (r_radius) {
+    *r_radius = data[0] * p0->radius + data[1] * p1->radius + data[2] * p2->radius +
+                data[3] * p3->radius;
   }
 
-  if (weight) {
-    *weight = data[0] * p0->weight + data[1] * p1->weight + data[2] * p2->weight +
-              data[3] * p3->weight;
+  if (r_weight) {
+    *r_weight = data[0] * p0->weight + data[1] * p1->weight + data[2] * p2->weight +
+                data[3] * p3->weight;
   }
 
   return true;