Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2016-05-03 09:40:14 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-05-03 09:40:14 +0300
commitead2496e6716dc15b0327ba69ebf16303ebc3877 (patch)
treef85341632de4ae9a05d0b2df6b70f27ab7e2f00d /source/blender/blenkernel/intern/curve.c
parent1fb17fcf230d973f76421ab40f5ffa38f99355e7 (diff)
Cleanup: use offset macro
Diffstat (limited to 'source/blender/blenkernel/intern/curve.c')
-rw-r--r--source/blender/blenkernel/intern/curve.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 4c099987404..8afb451f768 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -1402,14 +1402,14 @@ void BKE_nurb_makeCurve(Nurb *nu, float *coord_array, float *tilt_array, float *
}
}
- coord_fp = (float *)(((char *)coord_fp) + stride);
+ coord_fp = POINTER_OFFSET(coord_fp, stride);
if (tilt_fp)
- tilt_fp = (float *)(((char *)tilt_fp) + stride);
+ tilt_fp = POINTER_OFFSET(tilt_fp, stride);
if (radius_fp)
- radius_fp = (float *)(((char *)radius_fp) + stride);
+ radius_fp = POINTER_OFFSET(radius_fp, stride);
if (weight_fp)
- weight_fp = (float *)(((char *)weight_fp) + stride);
+ weight_fp = POINTER_OFFSET(weight_fp, stride);
u += ustep;
}
@@ -1440,7 +1440,7 @@ void BKE_curve_forward_diff_bezier(float q0, float q1, float q2, float q3, float
for (a = 0; a <= it; a++) {
*p = q0;
- p = (float *)(((char *)p) + stride);
+ p = POINTER_OFFSET(p, stride);
q0 += q1;
q1 += q2;
q2 += q3;
@@ -1465,7 +1465,7 @@ void BKE_curve_forward_diff_tangent_bezier(float q0, float q1, float q2, float q
for (a = 0; a <= it; a++) {
*p = q0;
- p = (float *)(((char *)p) + stride);
+ p = POINTER_OFFSET(p, stride);
q0 += q1;
q1 += q2;
}
@@ -1490,7 +1490,7 @@ static void forward_diff_bezier_cotangent(const float p0[3], const float p1[3],
( 6.0f * t) * p3[i];
}
normalize_v3(p);
- p = (float *)(((char *)p) + stride);
+ p = POINTER_OFFSET(p, stride);
}
}
@@ -2102,7 +2102,7 @@ static void alfa_bezpart(BezTriple *prevbezt, BezTriple *bezt, Nurb *nu, float *
*tilt_array = t[0] * pprev->alfa + t[1] * prevbezt->alfa + t[2] * bezt->alfa + t[3] * next->alfa;
}
- tilt_array = (float *)(((char *)tilt_array) + stride);
+ tilt_array = POINTER_OFFSET(tilt_array, stride);
}
if (radius_array) {
@@ -2123,7 +2123,7 @@ static void alfa_bezpart(BezTriple *prevbezt, BezTriple *bezt, Nurb *nu, float *
t[2] * bezt->radius + t[3] * next->radius;
}
- radius_array = (float *)(((char *)radius_array) + stride);
+ radius_array = POINTER_OFFSET(radius_array, stride);
}
if (weight_array) {
@@ -2131,7 +2131,7 @@ static void alfa_bezpart(BezTriple *prevbezt, BezTriple *bezt, Nurb *nu, float *
*weight_array = prevbezt->weight +
(bezt->weight - prevbezt->weight) * (3.0f * fac * fac - 2.0f * fac * fac * fac);
- weight_array = (float *)(((char *)weight_array) + stride);
+ weight_array = POINTER_OFFSET(weight_array, stride);
}
}
}