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>2020-03-25 11:32:44 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-03-25 11:32:44 +0300
commit1587eb16d8f24d1f7d90c623acffd0f8d7d9d4ea (patch)
treed423eec8f8a046f6aa94f25482228df163de6ae0
parent4c57f07a0fde0ca067e5b0e6609ded6c0e170cc2 (diff)
Cleanup: use const to for some mask arguments
-rw-r--r--source/blender/blenkernel/BKE_mask.h6
-rw-r--r--source/blender/blenkernel/intern/mask.c18
-rw-r--r--source/blender/editors/mask/mask_query.c14
3 files changed, 20 insertions, 18 deletions
diff --git a/source/blender/blenkernel/BKE_mask.h b/source/blender/blenkernel/BKE_mask.h
index 9c7d19ea151..cef26345980 100644
--- a/source/blender/blenkernel/BKE_mask.h
+++ b/source/blender/blenkernel/BKE_mask.h
@@ -106,10 +106,10 @@ float BKE_mask_spline_project_co(struct MaskSpline *spline,
const eMaskSign sign);
/* point */
-eMaskhandleMode BKE_mask_point_handles_mode_get(struct MaskSplinePoint *point);
-void BKE_mask_point_handle(struct MaskSplinePoint *point,
+eMaskhandleMode BKE_mask_point_handles_mode_get(const struct MaskSplinePoint *point);
+void BKE_mask_point_handle(const struct MaskSplinePoint *point,
eMaskWhichHandle which_handle,
- float handle[2]);
+ float r_handle[2]);
void BKE_mask_point_set_handle(struct MaskSplinePoint *point,
eMaskWhichHandle which_handle,
float loc[2],
diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c
index aafbcf0d360..eb274fc1ef3 100644
--- a/source/blender/blenkernel/intern/mask.c
+++ b/source/blender/blenkernel/intern/mask.c
@@ -508,9 +508,9 @@ float BKE_mask_spline_project_co(MaskSpline *spline,
/* point */
-eMaskhandleMode BKE_mask_point_handles_mode_get(MaskSplinePoint *point)
+eMaskhandleMode BKE_mask_point_handles_mode_get(const MaskSplinePoint *point)
{
- BezTriple *bezt = &point->bezt;
+ const BezTriple *bezt = &point->bezt;
if (bezt->h1 == bezt->h2 && bezt->h1 == HD_ALIGN) {
return MASK_HANDLE_MODE_STICK;
@@ -519,23 +519,25 @@ eMaskhandleMode BKE_mask_point_handles_mode_get(MaskSplinePoint *point)
return MASK_HANDLE_MODE_INDIVIDUAL_HANDLES;
}
-void BKE_mask_point_handle(MaskSplinePoint *point, eMaskWhichHandle which_handle, float handle[2])
+void BKE_mask_point_handle(const MaskSplinePoint *point,
+ eMaskWhichHandle which_handle,
+ float r_handle[2])
{
- BezTriple *bezt = &point->bezt;
+ const BezTriple *bezt = &point->bezt;
if (which_handle == MASK_WHICH_HANDLE_STICK) {
float vec[2];
sub_v2_v2v2(vec, bezt->vec[0], bezt->vec[1]);
- handle[0] = (bezt->vec[1][0] + vec[1]);
- handle[1] = (bezt->vec[1][1] - vec[0]);
+ r_handle[0] = (bezt->vec[1][0] + vec[1]);
+ r_handle[1] = (bezt->vec[1][1] - vec[0]);
}
else if (which_handle == MASK_WHICH_HANDLE_LEFT) {
- copy_v2_v2(handle, bezt->vec[0]);
+ copy_v2_v2(r_handle, bezt->vec[0]);
}
else if (which_handle == MASK_WHICH_HANDLE_RIGHT) {
- copy_v2_v2(handle, bezt->vec[2]);
+ copy_v2_v2(r_handle, bezt->vec[2]);
}
else {
BLI_assert(!"Unknown handle passed to BKE_mask_point_handle");
diff --git a/source/blender/editors/mask/mask_query.c b/source/blender/editors/mask/mask_query.c
index 78ea1803421..4459607191f 100644
--- a/source/blender/editors/mask/mask_query.c
+++ b/source/blender/editors/mask/mask_query.c
@@ -207,8 +207,8 @@ bool ED_mask_find_nearest_diff_point(const bContext *C,
return false;
}
-static void mask_point_scaled_handle(/*const*/ MaskSplinePoint *point,
- /*const*/ eMaskWhichHandle which_handle,
+static void mask_point_scaled_handle(const MaskSplinePoint *point,
+ const eMaskWhichHandle which_handle,
const float scalex,
const float scaley,
float handle[2])
@@ -265,9 +265,9 @@ MaskSplinePoint *ED_mask_point_find_nearest(const bContext *C,
for (int i = 0; i < spline_orig->tot_point; i++) {
MaskSplinePoint *cur_point_orig = &spline_orig->points[i];
- MaskSplinePoint *cur_point_deform_eval = &points_array[i];
+ const MaskSplinePoint *cur_point_deform_eval = &points_array[i];
eMaskWhichHandle cur_which_handle = MASK_WHICH_HANDLE_NONE;
- BezTriple *bezt = &cur_point_deform_eval->bezt;
+ const BezTriple *bezt = &cur_point_deform_eval->bezt;
float cur_len_sq, vec[2];
vec[0] = bezt->vec[1][0] * scalex;
@@ -630,9 +630,9 @@ bool ED_mask_selected_minmax(const bContext *C, float min[2], float max[2])
for (MaskSpline *spline = mask_layer->splines.first; spline != NULL; spline = spline->next) {
MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline);
for (int i = 0; i < spline->tot_point; i++) {
- MaskSplinePoint *point = &spline->points[i];
- MaskSplinePoint *deform_point = &points_array[i];
- BezTriple *bezt = &point->bezt;
+ const MaskSplinePoint *point = &spline->points[i];
+ const MaskSplinePoint *deform_point = &points_array[i];
+ const BezTriple *bezt = &point->bezt;
float handle[2];
if (!MASKPOINT_ISSEL_ANY(point)) {
continue;