Fix T55348: Renaming a marker can't cancel
authorCampbell Barton <ideasman42@gmail.com>
Thu, 7 Jun 2018 06:54:47 +0000 (08:54 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 7 Jun 2018 06:54:47 +0000 (08:54 +0200)
Regression in a14005c070a1f

source/blender/editors/interface/interface_templates.c

index d934d4d..9978726 100644 (file)
@@ -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;