Revision: 53300
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53300
Author: campbellbarton
Date: 2012-12-23 16:08:02 +0000 (Sun, 23 Dec 2012)
Log Message:
-----------
fix for use of uninitialized variable with ui_handler_region_menu.
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface_handlers.c
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c
2012-12-23 14:34:10 UTC (rev 53299)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c
2012-12-23 16:08:02 UTC (rev 53300)
@@ -6928,8 +6928,6 @@
{
ARegion *ar;
uiBut *but;
- uiHandleButtonData *data;
- int retval;
/* here we handle buttons at the window level, modal, for example
* while number sliding, text editing, or when a menu block is open */
@@ -6940,17 +6938,23 @@
but = ui_but_find_activated(ar);
if (but) {
+ uiHandleButtonData *data;
+
/* handle activated button events */
data = but->active;
if (data->state == BUTTON_STATE_MENU_OPEN) {
+ int retval;
+
/* handle events for menus and their buttons
recursively,
* this will handle events from the top to the bottom
menu */
if (data->menu)
retval = ui_handle_menus_recursive(C, event,
data->menu, 0);
/* handle events for the activated button */
- if (retval == WM_UI_HANDLER_CONTINUE || event->type ==
TIMER) {
+ if ((data->menu && (retval == WM_UI_HANDLER_CONTINUE))
||
+ (event->type == TIMER))
+ {
if (data->menu && data->menu->menuretval)
ui_handle_button_return_submenu(C,
event, but);
else
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
