diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-07 09:54:47 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-07 09:54:47 +0300 |
| commit | 2d2f23de10103528cb64beef58ec0cdb277409ff (patch) | |
| tree | 92031f18ad0b2531c27ffe36139b5c0482e568a1 | |
| parent | a60d4f33c614b81f12a1dc6822f893d79c679baf (diff) | |
Fix T55348: Renaming a marker can't cancel
Regression in a14005c070a1f
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; |