diff options
| author | Joshua Leung <aligorith@gmail.com> | 2016-06-23 17:52:13 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2016-06-23 18:18:36 +0300 |
| commit | 833e69ff7ead32f20cce36f3a1dfe90f80020ea1 (patch) | |
| tree | 03b8237e798e05b85ed1bc5fbc9afd8b7f3ea38b /source/blender/editors/animation | |
| parent | 7e53f9fb1af850271d92ddc92a50acbc7aafd48f (diff) | |
DopeSheet: GPencil-Mode supports Circle and Lasso Select
To get this working the least effort, I've had to expose the helper functions
used by the lasso and circle select keyframe-test callbacks (which are generic)
and expose them for use by the GP keyframe editing code too. Hopefully in time
we clean this all up and just write the code once to operate on "keyframes"
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/keyframes_edit.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c index f909b39cca3..7b35a154fc8 100644 --- a/source/blender/editors/animation/keyframes_edit.c +++ b/source/blender/editors/animation/keyframes_edit.c @@ -541,7 +541,7 @@ static short ok_bezier_region(KeyframeEditData *ked, BezTriple *bezt) /** * Called from #ok_bezier_region_lasso and #ok_bezier_channel_lasso */ -static bool bezier_region_lasso_test( +bool keyframe_region_lasso_test( const KeyframeEdit_LassoData *data_lasso, const float xy[2]) { @@ -564,7 +564,7 @@ static short ok_bezier_region_lasso(KeyframeEditData *ked, BezTriple *bezt) if (ked->data) { short ok = 0; -#define KEY_CHECK_OK(_index) bezier_region_lasso_test(ked->data, bezt->vec[_index]) +#define KEY_CHECK_OK(_index) keyframe_region_lasso_test(ked->data, bezt->vec[_index]) KEYFRAME_OK_CHECKS(KEY_CHECK_OK); #undef KEY_CHECK_OK @@ -596,7 +596,7 @@ static short ok_bezier_channel_lasso(KeyframeEditData *ked, BezTriple *bezt) pt[0] = bezt->vec[1][0]; pt[1] = ked->channel_y; - if (bezier_region_lasso_test(data, pt)) + if (keyframe_region_lasso_test(data, pt)) return KEYFRAME_OK_KEY; } return 0; @@ -605,7 +605,7 @@ static short ok_bezier_channel_lasso(KeyframeEditData *ked, BezTriple *bezt) /** * Called from #ok_bezier_region_circle and #ok_bezier_channel_circle */ -static bool bezier_region_circle_test( +bool keyframe_region_circle_test( const KeyframeEdit_CircleData *data_circle, const float xy[2]) { @@ -629,7 +629,7 @@ static short ok_bezier_region_circle(KeyframeEditData *ked, BezTriple *bezt) if (ked->data) { short ok = 0; -#define KEY_CHECK_OK(_index) bezier_region_circle_test(ked->data, bezt->vec[_index]) +#define KEY_CHECK_OK(_index) keyframe_region_circle_test(ked->data, bezt->vec[_index]) KEYFRAME_OK_CHECKS(KEY_CHECK_OK); #undef KEY_CHECK_OK @@ -661,7 +661,7 @@ static short ok_bezier_channel_circle(KeyframeEditData *ked, BezTriple *bezt) pt[0] = bezt->vec[1][0]; pt[1] = ked->channel_y; - if (bezier_region_circle_test(data, pt)) + if (keyframe_region_circle_test(data, pt)) return KEYFRAME_OK_KEY; } return 0; |