Index: source/blender/src/buttons_shading.c =================================================================== RCS file: /cvsroot/bf-blender/blender/source/blender/src/buttons_shading.c,v retrieving revision 1.240 diff -u -r1.240 buttons_shading.c --- source/blender/src/buttons_shading.c 3 May 2007 21:37:52 -0000 1.240 +++ source/blender/src/buttons_shading.c 4 May 2007 02:20:39 -0000 @@ -3348,35 +3348,24 @@ &ma->sss_error, 0.0001, 10, 1, 3, "Error"); uiBlockEndAlign(block); + uiBlockBeginAlign(block); + bt=uiDefButF(block, COL, B_MATPRV, "", 165,150,145,20, + &ma->sss_col, 0.0, 1.0, 0, 0, + "Scattering color"); + uiButSetFunc(bt, material_sss_custom_set_cb, ma, NULL); + uiDefButF(block, NUMSLI, B_MATPRV, "Col ", 165,130,145,20, + &ma->sss_colfac, 0.0, 1.0, 0, 0, + "Blend factor for SSS colors"); + uiDefButF(block, NUMSLI, B_MATPRV, "Tex ", 165,110,145,20, + &ma->sss_texfac, 0.0, 1.0, 0, 0, + "Texture scattering factor"); + uiBlockEndAlign(block); + uiBlockBeginAlign(block); - bt=uiDefButF(block, NUMSLI, B_MATPRV, "R ", 165,150,145,20, - &ma->sss_col[0], 0.0, 1.0, 0, 0, - "Red scattering color"); - uiButSetFunc(bt, material_sss_custom_set_cb, ma, NULL); - bt=uiDefButF(block, NUMSLI, B_MATPRV, "G ", 165,130,145,20, - &ma->sss_col[1], 0.0, 1.0, 0, 0, - "Green scattering color"); - uiButSetFunc(bt, material_sss_custom_set_cb, ma, NULL); - bt=uiDefButF(block, NUMSLI, B_MATPRV, "B ", 165,110,145,20, - &ma->sss_col[2], 0.0, 1.0, 0, 0, - "Blue scattering color"); - uiButSetFunc(bt, material_sss_custom_set_cb, ma, NULL); - uiBlockEndAlign(block); - - uiBlockBeginAlign(block); - uiDefButF(block, NUMSLI, B_MATPRV, "Col ", 165,80,145,20, - &ma->sss_colfac, 0.0, 1.0, 0, 0, - "Blend factor for SSS colors"); - uiDefButF(block, NUMSLI, B_MATPRV, "Tex ", 165,60,145,20, - &ma->sss_texfac, 0.0, 1.0, 0, 0, - "Texture scattering factor"); - uiBlockEndAlign(block); - - uiBlockBeginAlign(block); - uiDefButF(block, NUMSLI, B_MATPRV, "Front ", 165,30,145,20, + uiDefButF(block, NUMSLI, B_MATPRV, "Front ", 165,80,145,20, &ma->sss_front, 0.0, 2.0, 0, 0, "Front scattering weight"); - uiDefButF(block, NUMSLI, B_MATPRV, "Back ", 165,10,145,20, + uiDefButF(block, NUMSLI, B_MATPRV, "Back ", 165,60,145,20, &ma->sss_back, 0.0, 10.0, 0, 0, "Back scattering weight"); uiBlockEndAlign(block);