diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-04-08 20:56:44 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-04-08 20:56:44 +0400 |
| commit | 1728c20a63123f1377f7192c1bd521286eac2228 (patch) | |
| tree | 376d979006aca8fee63e880c2120b655c7bcf833 /source/blender/editors/interface | |
| parent | 626c26809624305a936b87485ee1123136ada658 (diff) | |
Fixes related to using Library files:
- Assigning local materials to library objects disabled
(crashes on undo/redo cases)
- Disabling options in Material buttons to add/remove slots
on library data
- Drawing Object ID template in Object properties, this
allows browse active Object, but especially shows library
status then.
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 42b6926e847..01e785ef88c 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -416,7 +416,7 @@ static void template_ID(bContext *C, uiLayout *layout, TemplateID *template, Str if(user_alert) uiButSetFlag(but, UI_BUT_REDALERT); - if(id->lib == NULL && !(ELEM4(GS(id->name), ID_GR, ID_SCE, ID_SCR, ID_TXT))) { + if(id->lib == NULL && !(ELEM5(GS(id->name), ID_GR, ID_SCE, ID_SCR, ID_TXT, ID_OB))) { uiDefButR(block, TOG, 0, "F", 0, 0, UI_UNIT_X, UI_UNIT_Y, &idptr, "use_fake_user", -1, 0, 0, -1, -1, NULL); } } |