diff options
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/curve.c | 7 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 0ce2953a2e3..d56402525f0 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -1929,7 +1929,8 @@ static int vergxcobev(const void *a1, const void *a2) /* this function cannot be replaced with atan2, but why? */ -static void calc_bevel_sin_cos(float x1, float y1, float x2, float y2, float *sina, float *cosa) +static void calc_bevel_sin_cos(float x1, float y1, float x2, float y2, + float *r_sina, float *r_cosa) { float t01, t02, x3, y3; @@ -1967,8 +1968,8 @@ static void calc_bevel_sin_cos(float x1, float y1, float x2, float y2, float *si y3 /= t01; } - *sina = -y3 / t02; - *cosa = x3 / t02; + *r_sina = -y3 / t02; + *r_cosa = x3 / t02; } diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 88bd7d74743..be91cb5dc9d 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2519,7 +2519,7 @@ void BKE_object_dimensions_get(Object *ob, float vec[3]) } } -void BKE_object_dimensions_set(Object *ob, const float *value) +void BKE_object_dimensions_set(Object *ob, const float value[3]) { BoundBox *bb = NULL; |