[Bf-blender-cvs] [d73a576] pie-menus: minor tweaks
Campbell Barton
noreply at git.blender.org
Thu Aug 7 16:08:05 CEST 2014
Commit: d73a57698bc2bea3e747288f868b3ddcc6aaef84
Author: Campbell Barton
Date: Fri Aug 8 00:02:19 2014 +1000
Branches: pie-menus
https://developer.blender.org/rBd73a57698bc2bea3e747288f868b3ddcc6aaef84
minor tweaks
===================================================================
M source/blender/editors/interface/interface_regions.c
M source/blender/editors/interface/interface_widgets.c
M source/blender/windowmanager/intern/wm_event_system.c
===================================================================
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index b97ac01..2a07289 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -2814,8 +2814,10 @@ void uiPieEnumInvoke(struct bContext *C, const char *title, const char *path,
}
/* invalid property, only accept enums */
- if (RNA_property_type(r_prop) != PROP_ENUM)
+ if (RNA_property_type(r_prop) != PROP_ENUM) {
+ BLI_assert(0);
return;
+ }
pie = uiPieMenuBegin(C, IFACE_(title), ICON_NONE, event);
layout = uiPieMenuLayout(pie);
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 56d6639..db4ddea 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1911,7 +1911,7 @@ static void widget_state_pulldown(uiWidgetType *wt, int state)
static void widget_state_pie_menu_item(uiWidgetType *wt, int state)
{
wt->wcol = *(wt->wcol_theme);
-
+
/* active and disabled (not so common) */
if ((state & UI_BUT_DISABLED) && (state & UI_ACTIVE)) {
widget_state_blend(wt->wcol.text, wt->wcol.text_sel, 0.5f);
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 56c6c15..ab4b21d 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -2584,8 +2584,9 @@ wmEventHandler *WM_event_add_ui_handler(
handler->ui_menu = NULL;
}
- if (accept_dbl_click)
+ if (accept_dbl_click) {
handler->flag |= WM_HANDLER_ACCEPT_DBL_CLICK;
+ }
BLI_addhead(handlers, handler);
More information about the Bf-blender-cvs
mailing list