diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-05 02:29:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-05 02:29:33 +0400 |
| commit | 463f2a43dcc81dae0e1aa39633f313acd1f50c12 (patch) | |
| tree | b8a6bd9ae1870477a0c06ae960e3b375025e7f51 | |
| parent | f9c28cdc7a531247825ae93f3a7bb022f1e76686 (diff) | |
revert part of own commit r56476, caused scene unlink button to be removed.
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 84f30ecca76..4bb4fe6b532 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -577,7 +577,8 @@ static void template_ID(bContext *C, uiLayout *layout, TemplateID *template, Str } /* delete button */ - if (id && (flag & UI_ID_DELETE) && RNA_property_is_unlink(template->prop)) { + /* don't use RNA_property_is_unlink here */ + if (id && (flag & UI_ID_DELETE) && (RNA_property_flag(template->prop) & PROP_NEVER_UNLINK) == 0) { if (unlinkop) { but = uiDefIconButO(block, BUT, unlinkop, WM_OP_INVOKE_REGION_WIN, ICON_X, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL); /* so we can access the template from operators, font unlinking needs this */ |