[Bf-blender-cvs] [6f96dd85766] master: Fix T78503: Disabled layout portion passes mouse through

Hans Goudey noreply at git.blender.org
Fri Oct 2 20:07:08 CEST 2020


Commit: 6f96dd85766a8159d5ffb761cbb4dbd20b7cad00
Author: Hans Goudey
Date:   Fri Oct 2 13:06:58 2020 -0500
Branches: master
https://developer.blender.org/rB6f96dd85766a8159d5ffb761cbb4dbd20b7cad00

Fix T78503: Disabled layout portion passes mouse through

3D Viewport -> Sidebar -> View -> Local Camera is disabled. When you
click on it, box select starts. This behavior isn't intended, and fixing
it is quite simple. The only case where this would continuing would
still be desired is if a disabled button overlapped with a non-disabled
button, but this shouldn't be the case anywhere.

Differential Revision: https://developer.blender.org/D8832

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

M	source/blender/editors/interface/interface_handlers.c

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

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index efa5613e210..f2d9f90f354 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -7580,7 +7580,7 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, const wmEvent *
   }
 
   if (but->flag & UI_BUT_DISABLED) {
-    return WM_UI_HANDLER_CONTINUE;
+    return WM_UI_HANDLER_BREAK;
   }
 
   switch (but->type) {



More information about the Bf-blender-cvs mailing list