diff options
author | Campbell Barton <ideasman42@gmail.com> | 2008-02-11 06:16:22 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2008-02-11 06:16:22 +0300 |
commit | 4f9f42d30eb3349a6b15e16a5b25e31ca293d5c8 (patch) | |
tree | 80ab2f637944cced714ad22961a9aba9b1f67f63 /source/blender/src/buttons_shading.c | |
parent | 28c733406dd72db992cada4fe1c5191124e9c68b (diff) |
World settings ambient occlusion could be set even when its a library
making local objects with a dupligroup didnt disable the indirect flag, also made the tool respect visible and restricted flags.
Diffstat (limited to 'source/blender/src/buttons_shading.c')
-rw-r--r-- | source/blender/src/buttons_shading.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c index 76a4f024f26..673f835cc49 100644 --- a/source/blender/src/buttons_shading.c +++ b/source/blender/src/buttons_shading.c @@ -2145,7 +2145,9 @@ static void world_panel_amb_occ(World *wrld) block= uiNewBlock(&curarea->uiblocks, "world_panel_amb_oc", UI_EMBOSS, UI_HELV, curarea->win); uiNewPanelTabbed("Mist / Stars / Physics", "World"); if(uiNewPanel(curarea, block, "Amb Occ", "World", PANELX, PANELY, PANELW, PANELH)==0) return; - + uiSetButLock(wrld->id.lib!=0, ERROR_LIBDATA_MESSAGE); + + uiBlockSetCol(block, TH_BUT_SETTING1); uiDefButBitS(block, TOG, WO_AMB_OCC, B_REDR, "Ambient Occlusion", X2CLM1, yco-=BUTH, BUTW1, BUTH, &wrld->mode, 0, 0, 0, 0, "Toggles ambient occlusion (soft shadows)"); |