diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-06-04 15:47:29 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-06-04 19:26:02 +0300 |
commit | 5916b09670b861117b9c87778c0ddc8bcf0a2c35 (patch) | |
tree | eca980aa6540cef92ff5ebd9f7e6b3eda05cef58 /source/blender/editors/space_clip/tracking_select.c | |
parent | 5158896d7db6b9b9b9bb789073f835648d881a7f (diff) |
Fix T65032: selection conflicts between motion tracks and masks in clip editor
Diffstat (limited to 'source/blender/editors/space_clip/tracking_select.c')
-rw-r--r-- | source/blender/editors/space_clip/tracking_select.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/editors/space_clip/tracking_select.c b/source/blender/editors/space_clip/tracking_select.c index 2b70aec02bb..4532b61f291 100644 --- a/source/blender/editors/space_clip/tracking_select.c +++ b/source/blender/editors/space_clip/tracking_select.c @@ -37,9 +37,10 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_clip.h" +#include "ED_mask.h" #include "ED_screen.h" #include "ED_select_utils.h" -#include "ED_clip.h" #include "RNA_access.h" #include "RNA_define.h" @@ -364,6 +365,8 @@ static int mouse_select(bContext *C, float co[2], const bool extend, const bool else if (deselect_all) { ed_tracking_deselect_all_tracks(tracksbase); ed_tracking_deselect_all_plane_tracks(plane_tracks_base); + /* Mask as well if we are in combined mask / track view. */ + ED_mask_deselect_all(C); } if (!extend) { @@ -472,6 +475,12 @@ void CLIP_OT_select(wmOperatorType *ot) 100.0f); } +bool ED_clip_can_select(bContext *C) +{ + /* To avoid conflicts with mask select deselect all in empty space. */ + return select_poll(C); +} + /********************** box select operator *********************/ static int box_select_exec(bContext *C, wmOperator *op) |