[Bf-blender-cvs] [25f8dfd4366] tracking_tools: Merge branch 'master' into tracking_tools

Sebastian Koenig noreply at git.blender.org
Thu Apr 28 07:47:58 CEST 2022


Commit: 25f8dfd43669b7e6c38639361feaa9d0297ab890
Author: Sebastian Koenig
Date:   Wed Apr 27 13:59:35 2022 +0200
Branches: tracking_tools
https://developer.blender.org/rB25f8dfd43669b7e6c38639361feaa9d0297ab890

Merge branch 'master' into tracking_tools

===================================================================



===================================================================

diff --cc source/blender/editors/mask/mask_select.c
index 938aec7d4b4,0bd054e1b89..418cf218d1f
--- a/source/blender/editors/mask/mask_select.c
+++ b/source/blender/editors/mask/mask_select.c
@@@ -354,9 -361,9 +357,9 @@@ bool ED_mask_select_mouse_pick(bContex
  
      ED_mask_view_lock_state_restore_no_jump(C, &lock_state);
  
-     return true;
+     return OPERATOR_PASS_THROUGH | OPERATOR_FINISHED;
    }
 -  if (deselect_all) {
 +  if (properties->deselect_all) {
      /* For clip editor tracks, leave deselect all to clip editor. */
      if (!ED_clip_can_select(C)) {
        ED_mask_deselect_all(C);



More information about the Bf-blender-cvs mailing list