kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix for bug #18087: Editing of object name and modifiers did not

Browse Source 
work in editing buttons if the object data was linked.
This commit is contained in:
Brecht Van Lommel 2009-01-27 22:09:23 +00:00
parent 5542f25331
commit 7eae2080f2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/src/buttons_editing.c
View File

@ -1944,13 +1944,14 @@ static void draw_modifier(uiBlock *block, Object *ob, ModifierData *md, int *xco
uiButSetFunc(but, modifiers_applyModifier, ob, md); uiButSetFunc(but, modifiers_applyModifier, ob, md);
} }
uiClearButLock();
uiSetButLock(ob && ob->id.lib, ERROR_LIBDATA_MESSAGE);
if (md->type!=eModifierType_Fluidsim && md->type!=eModifierType_Softbody && md->type!=eModifierType_ParticleSystem && (md->type!=eModifierType_Cloth)) { if (md->type!=eModifierType_Fluidsim && md->type!=eModifierType_Softbody && md->type!=eModifierType_ParticleSystem && (md->type!=eModifierType_Cloth)) {
but = uiDefBut(block, BUT, B_MODIFIER_RECALC, "Copy", lx,(cy-=19),60,19, 0, 0, 0, 0, 0, "Duplicate the current modifier at the same position in the stack"); but = uiDefBut(block, BUT, B_MODIFIER_RECALC, "Copy", lx,(cy-=19),60,19, 0, 0, 0, 0, 0, "Duplicate the current modifier at the same position in the stack");
uiButSetFunc(but, modifiers_copyModifier, ob, md); uiButSetFunc(but, modifiers_copyModifier, ob, md);
} }
uiBlockEndAlign(block); uiBlockEndAlign(block);
uiSetButLock(ob && ob->id.lib, ERROR_LIBDATA_MESSAGE);
} }
lx = x + 10; lx = x + 10;
@ -5525,7 +5526,6 @@ static void editing_panel_links(Object *ob)
uiBlockSetCol(block, TH_AUTO); uiBlockSetCol(block, TH_AUTO);
} }
if(ob) { if(ob) {
uiSetButLock(object_data_is_libdata(ob), ERROR_LIBDATA_MESSAGE);
but = uiDefBut(block, TEX, B_IDNAME, "OB:", xco, 180, 454-xco, YIC, ob->id.name+2, 0.0, 21.0, 0, 0, "Active Object name."); but = uiDefBut(block, TEX, B_IDNAME, "OB:", xco, 180, 454-xco, YIC, ob->id.name+2, 0.0, 21.0, 0, 0, "Active Object name.");
#ifdef WITH_VERSE #ifdef WITH_VERSE
if(ob->vnode) uiButSetFunc(but, test_and_send_idbutton_cb, ob, ob->id.name); if(ob->vnode) uiButSetFunc(but, test_and_send_idbutton_cb, ob, ob->id.name);
@ -5534,6 +5534,7 @@ static void editing_panel_links(Object *ob)
uiButSetFunc(but, test_idbutton_cb, ob->id.name, NULL); uiButSetFunc(but, test_idbutton_cb, ob->id.name, NULL);
#endif #endif
uiSetButLock(object_data_is_libdata(ob), ERROR_LIBDATA_MESSAGE);
} }
/* empty display handling, note it returns! */ /* empty display handling, note it returns! */