diff options
Diffstat (limited to 'source/blender/src/buttons_shading.c')
| -rw-r--r-- | source/blender/src/buttons_shading.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c index bcd6ffb1aef..b0d840433d2 100644 --- a/source/blender/src/buttons_shading.c +++ b/source/blender/src/buttons_shading.c @@ -3921,14 +3921,14 @@ static void material_panel_ramps(Material *ma) uiNewPanelTabbed("Material", "Material"); if(uiNewPanel(curarea, block, "Ramps", "Material", 640, 0, 318, 204)==0) return; - uiSetButLock(ma->id.lib!=NULL, ERROR_LIBDATA_MESSAGE); - uiBlockBeginAlign(block); uiBlockSetCol(block, TH_BUT_SETTING1); uiDefButS(block, ROW, B_REDR, "Show Col Ramp",10,180,150,20, &ma->ramp_show, 0, 0, 0, 0, "Show ramp buttons for material diffuse color"); uiDefButS(block, ROW, B_REDR, "Show Spec Ramp",160,180,150,20, &ma->ramp_show, 0, 1, 0, 0, "Show ramp buttons for material specular color"); uiBlockSetCol(block, TH_AUTO); + uiSetButLock(ma->id.lib!=NULL, ERROR_LIBDATA_MESSAGE); + /* COLORBAND */ uiBlockBeginAlign(block); uiDefButBitI(block, TOG, ma->ramp_show?MA_RAMP_SPEC:MA_RAMP_COL, B_MATCOLORBAND, "Colorband",10,145,80,20, &ma->mode, 0, 0, 0, 0, "Toggles colorband ramp operations"); @@ -4166,6 +4166,7 @@ static void material_panel_links(Object *ob, Material *ma) } uiBlockSetCol(block, TH_BUT_ACTION); + uiClearButLock(); uiDefButBitS(block, TOG, 1<<(ob->actcol-1), B_MATFROM, "OB", 125,135,32,20, &ob->colbits, 0, 0, 0, 0, "Links material to object"); idn= ob->data; strncpy(str, idn->name, 2); |