diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-12-07 17:17:38 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-12-07 17:17:38 +0300 |
| commit | 17231f83f37be4890c4067caa72d4957207975b0 (patch) | |
| tree | 298c6ca2cbb01b6c546162b070498c6b7f123450 /source/blender/src/buttons_shading.c | |
| parent | 80d1d88ef6dbcae8bfba2bbc7429310bac127652 (diff) | |
Work on RenderLayer and Pass control:
Full log:
http://www.blender3d.org/cms/Render_Passes.829.0.html
In short:
- Passes now have option to be excluded from "Combined".
- RenderLayers allow to override Light (Lamp groups) or Material.
- RenderLayers and Passes are in Outliner now, (ab)using Matt's nice
'restriction collumns'. :)
Diffstat (limited to 'source/blender/src/buttons_shading.c')
| -rw-r--r-- | source/blender/src/buttons_shading.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c index d9837e7eaa9..3392f074a09 100644 --- a/source/blender/src/buttons_shading.c +++ b/source/blender/src/buttons_shading.c @@ -2821,9 +2821,7 @@ static void material_panel_texture(Material *ma) for(a= 0; a<MAX_MTEX; a++) { mtex= ma->mtex[a]; if(mtex && mtex->tex) { - if(ma->septex & (1<<a)) - uiDefButBitS(block, TOG, 1<<a, B_MATPRV, " ", -20, 180-18*a, 28, 20, &ma->septex, 0.0, 0.0, 0, 0, "Click to disable or enable this texture channel"); - else uiDefIconButBitS(block, TOG, 1<<a, B_MATPRV, ICON_CHECKBOX_HLT, -20, 180-18*a, 28, 20, &ma->septex, 0.0, 0.0, 0, 0, "Click to disable or enable this texture channel"); + uiDefIconButBitS(block, ICONTOGN, 1<<a, B_MATPRV, ICON_CHECKBOX_HLT-1, -20, 180-18*a, 28, 20, &ma->septex, 0.0, 0.0, 0, 0, "Click to disable or enable this texture channel"); } } uiBlockBeginAlign(block); |