sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Macros in macro didn't work correctly.

Browse Source
This commit is contained in:
Martin Poirier 2009-12-05 19:05:21 +00:00
parent d98cbf7727
commit f287762678
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/windowmanager/intern/wm_event_system.c
View File

@ -382,10 +382,13 @@ static wmOperator *wm_operator_create(wmWindowManager *wm, wmOperatorType *ot, P
if(ot->macro.first) {
static wmOperator *motherop= NULL;
wmOperatorTypeMacro *otmacro;
int root = 0;
/* ensure all ops are in execution order in 1 list */
if(motherop==NULL)
motherop= op;
if(motherop==NULL) {
motherop = op;
root = 1;
}
for(otmacro= ot->macro.first; otmacro; otmacro= otmacro->next) {
wmOperatorType *otm= WM_operatortype_find(otmacro->idname, 0);
@ -395,7 +398,8 @@ static wmOperator *wm_operator_create(wmWindowManager *wm, wmOperatorType *ot, P
opm->opm= motherop; /* pointer to mom, for modal() */
}
motherop= NULL;
if (root)
motherop= NULL;
}
return op;