[Bf-blender-cvs] [74fae33] master: Fix T45825: Macro redo disable options incorrectly

Campbell Barton noreply at git.blender.org
Tue Sep 1 10:53:49 CEST 2015


Commit: 74fae33ee550336c5eb343873ea9c38605e5802f
Author: Campbell Barton
Date:   Tue Sep 1 18:41:37 2015 +1000
Branches: master
https://developer.blender.org/rB74fae33ee550336c5eb343873ea9c38605e5802f

Fix T45825: Macro redo disable options incorrectly

A non repeatable operator would disable editing options for all operators after it.

===================================================================

M	source/blender/editors/interface/interface_layout.c

===================================================================

diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index efa358f..67b4f18 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -3388,6 +3388,10 @@ void uiLayoutOperatorButs(
 		/* XXX, could give some nicer feedback or not show redo panel at all? */
 		uiItemL(layout, IFACE_("* Redo Unsupported *"), ICON_NONE);
 	}
+	else {
+		/* useful for macros where only one of the steps can't be re-done */
+		UI_block_lock_clear(uiLayoutGetBlock(layout));
+	}
 
 	/* menu */
 	if (op->type->flag & OPTYPE_PRESET) {




More information about the Bf-blender-cvs mailing list