Bugfix #17566

Modifier buttons: now check properly for external lib data, modifiers are
on object only. Only "Apply" is locked now.

diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 0a792b05428c804479851730963ab3d916c991e0..425ec8956cbd1dcb21fe71440b1b915c937d4335 100644 (file)
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -1855,6 +1855,8 @@ static void draw_modifier(uiBlock *block, Object *ob, ModifierData *md, int *xco
                y -= 18;
 
                if (!isVirtual && (md->type!=eModifierType_Collision)) {
+                       uiSetButLock(object_data_is_libdata(ob), ERROR_LIBDATA_MESSAGE); /* only here obdata, the rest of modifiers is ob level */
+
                        uiBlockBeginAlign(block);
                        if (md->type==eModifierType_ParticleSystem) {
                                but = uiDefBut(block, BUT, B_MODIFIER_RECALC, "Convert",        lx,(cy-=19),60,19, 0, 0, 0, 0, 0, "Convert the current particles to a mesh object");
@@ -1870,6 +1872,8 @@ static void draw_modifier(uiBlock *block, Object *ob, ModifierData *md, int *xco
                                uiButSetFunc(but, modifiers_copyModifier, ob, md);
                        }
                        uiBlockEndAlign(block);
+                       
+                       uiSetButLock(ob && ob->id.lib, ERROR_LIBDATA_MESSAGE);
                }
 
                lx = x + 10;
@@ -2552,7 +2556,7 @@ static void editing_panel_modifiers(Object *ob)
        block= uiNewBlock(&curarea->uiblocks, "editing_panel_modifiers", UI_EMBOSS, UI_HELV, curarea->win);
        if( uiNewPanel(curarea, block, "Modifiers", "Editing", 640, 0, 318, 204)==0) return;
        
-       uiSetButLock(object_data_is_libdata(ob), ERROR_LIBDATA_MESSAGE);
+       uiSetButLock((ob && ob->id.lib), ERROR_LIBDATA_MESSAGE);
        uiNewPanelHeight(block, 204);
 
        uiDefBlockBut(block, modifiers_add_menu, ob, "Add Modifier", 0, 190, 130, 20, "Add a new modifier");