[Bf-blender-cvs] [2d2f23de101] blender2.8: Fix T55348: Renaming a marker can't cancel

Campbell Barton noreply at git.blender.org
Thu Jun 7 09:22:15 CEST 2018


Commit: 2d2f23de10103528cb64beef58ec0cdb277409ff
Author: Campbell Barton
Date:   Thu Jun 7 08:54:47 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB2d2f23de10103528cb64beef58ec0cdb277409ff

Fix T55348: Renaming a marker can't cancel

Regression in a14005c070a1f

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

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

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

diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index d934d4dd1e4..9978726fa74 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -3970,7 +3970,9 @@ eAutoPropButsReturn uiTemplateOperatorPropertyButs(
 #endif
 
 	/* set various special settings for buttons */
-	{
+
+	/* Only do this if we're not refreshing an existing UI. */
+	if (block->oldblock == NULL) {
 		const bool is_popup = (block->flag & UI_BLOCK_KEEP_OPEN) != 0;
 		uiBut *but;



More information about the Bf-blender-cvs mailing list