diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-10-29 22:56:21 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-10-29 22:56:21 +0400 |
| commit | bc5218a0f4fe4dd72c6df7266f3c45b548fc137e (patch) | |
| tree | b169eafa8bc13b7599b4a718fb25f71bb302cd89 /source | |
| parent | 8f747c49230532b9f1d8e51c41561a2d1a2b8b81 (diff) | |
Code cleanup: more int->bool conversions mask module
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/BKE_mask.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/mask.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 7 |
3 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_mask.h b/source/blender/blenkernel/BKE_mask.h index 7f703a0440f..64eec65f443 100644 --- a/source/blender/blenkernel/BKE_mask.h +++ b/source/blender/blenkernel/BKE_mask.h @@ -90,7 +90,7 @@ float BKE_mask_spline_project_co(struct MaskSpline *spline, struct MaskSplinePoi /* point */ int BKE_mask_point_has_handle(struct MaskSplinePoint *point); void BKE_mask_point_handle(struct MaskSplinePoint *point, float handle[2]); -void BKE_mask_point_set_handle(struct MaskSplinePoint *point, float loc[2], int keep_direction, +void BKE_mask_point_set_handle(struct MaskSplinePoint *point, float loc[2], bool keep_direction, float orig_handle[2], float orig_vec[3][3]); void BKE_mask_point_segment_co(struct MaskSpline *spline, struct MaskSplinePoint *point, float u, float co[2]); diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c index 597cfa5d76e..e8851102fb8 100644 --- a/source/blender/blenkernel/intern/mask.c +++ b/source/blender/blenkernel/intern/mask.c @@ -462,7 +462,7 @@ void BKE_mask_point_handle(MaskSplinePoint *point, float handle[2]) handle[1] = (point->bezt.vec[1][1] - vec[0]); } -void BKE_mask_point_set_handle(MaskSplinePoint *point, float loc[2], int keep_direction, +void BKE_mask_point_set_handle(MaskSplinePoint *point, float loc[2], bool keep_direction, float orig_handle[2], float orig_vec[3][3]) { BezTriple *bezt = &point->bezt; diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 573c4f15657..ce346c7952d 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -6824,8 +6824,11 @@ void flushTransMasking(TransInfo *t) td->loc2d[1] = td->loc[1] * inv[1]; mul_m3_v2(tdm->parent_inverse_matrix, td->loc2d); - if (tdm->is_handle) - BKE_mask_point_set_handle(tdm->point, td->loc2d, t->flag & T_ALT_TRANSFORM, tdm->orig_handle, tdm->vec); + if (tdm->is_handle) { + BKE_mask_point_set_handle(tdm->point, td->loc2d, + (t->flag & T_ALT_TRANSFORM) != 0, + tdm->orig_handle, tdm->vec); + } } } |