[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18748] branches/blender2.5/blender/source /blender/editors/interface/interface_handlers.c: 2.5: fix mistake in last commit, was crashing menus.

[Brecht Van Lommel]

Revision: 18748
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18748
Author:   blendix
Date:     2009-01-30 13:49:01 +0100 (Fri, 30 Jan 2009)

Log Message:
-----------
2.5: fix mistake in last commit, was crashing menus.

Modified Paths:
--------------
    
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c

Modified: 
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- 
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
   2009-01-30 12:18:08 UTC (rev 18747)
+++ 
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
   2009-01-30 12:49:01 UTC (rev 18748)
@@ -1431,6 +1431,7 @@
 static void ui_blockopen_begin(bContext *C, uiBut *but, uiHandleButtonData 
*data)
 {
        uiBlockCreateFunc func= NULL;
+       uiBlockHandleCreateFunc handlefunc= NULL;
        uiMenuCreateFunc menufunc= NULL;
        void *arg= NULL;
 
@@ -1449,15 +1450,15 @@
                        data->value= data->origvalue;
                        but->editval= &data->value;
 
-                       func= ui_block_func_MENU;
+                       handlefunc= ui_block_func_MENU;
                        arg= but;
                        break;
                case ICONROW:
-                       func= ui_block_func_ICONROW;
+                       handlefunc= ui_block_func_ICONROW;
                        arg= but;
                        break;
                case ICONTEXTROW:
-                       func= ui_block_func_ICONTEXTROW;
+                       handlefunc= ui_block_func_ICONTEXTROW;
                        arg= but;
                        break;
                case COL:
@@ -1465,13 +1466,13 @@
                        VECCOPY(data->vec, data->origvec);
                        but->editvec= data->vec;
 
-                       func= ui_block_func_COL;
+                       handlefunc= ui_block_func_COL;
                        arg= but;
                        break;
        }
 
-       if(func) {
-               data->menu= ui_popup_block_create(C, data->region, but, func, 
NULL, arg);
+       if(func || handlefunc) {
+               data->menu= ui_popup_block_create(C, data->region, but, func, 
handlefunc, arg);
                if(but->block->handle)
                        data->menu->popup= but->block->handle->popup;
        }


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs