[Bf-blender-cvs] [395fa5eb4c1] master: Fix T63912: don't collapse menu separators for pie menus

Harley Acheson noreply at git.blender.org
Tue Apr 30 12:47:59 CEST 2019


Commit: 395fa5eb4c1c52d4ea133f7ac2b96dbd6beb7c18
Author: Harley Acheson
Date:   Tue Apr 30 12:39:05 2019 +0200
Branches: master
https://developer.blender.org/rB395fa5eb4c1c52d4ea133f7ac2b96dbd6beb7c18

Fix T63912: don't collapse menu separators for pie menus

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

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

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

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

diff --git a/source/blender/editors/interface/interface_query.c b/source/blender/editors/interface/interface_query.c
index a2180e63efb..b0fd0cdc35f 100644
--- a/source/blender/editors/interface/interface_query.c
+++ b/source/blender/editors/interface/interface_query.c
@@ -475,7 +475,7 @@ bool UI_block_is_empty(const uiBlock *block)
 
 bool UI_block_can_add_separator(const uiBlock *block)
 {
-  if (ui_block_is_menu(block)) {
+  if (ui_block_is_menu(block) && !ui_block_is_pie_menu(block)) {
     const uiBut *but = block->buttons.last;
     return (but && !ELEM(but->type, UI_BTYPE_SEPR_LINE, UI_BTYPE_SEPR));
   }



More information about the Bf-blender-cvs mailing list