Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-04-26 21:36:54 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-04-26 21:36:54 +0400
commit6d83322841f8d0b260f98cd19f56b5e2c3f1bc56 (patch)
treee791eeb8b30264c936ce0b067ab3ad251b54d1e7 /source/blender/windowmanager
parent44b9de12b59c4b469a095c25c18145423da19ba8 (diff)
add support for macro redo if all operators in the macro have an exec()
this fixes [#35079]
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/intern/wm_event_system.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 098fe72688c..e104da6c067 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -711,7 +711,21 @@ int WM_operator_repeat(bContext *C, wmOperator *op)
* checks if WM_operator_repeat() can run at all, not that it WILL run at any time. */
int WM_operator_repeat_check(const bContext *UNUSED(C), wmOperator *op)
{
- return op->type->exec != NULL;
+ if (op->type->exec != NULL) {
+ return true;
+ }
+ else if (op->opm) {
+ /* for macros, check all have exec() we can call */
+ wmOperator *opm;
+ for (opm = op->opm->type->macro.first; opm; opm = opm->next) {
+ if (opm->type->exec == NULL) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ return false;
}
static wmOperator *wm_operator_create(wmWindowManager *wm, wmOperatorType *ot,