Index: source/blender/src/buttons_shading.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/buttons_shading.c,v
retrieving revision 1.230
diff -r1.230 buttons_shading.c
2160a2161,2163
>     float *colpoin = NULL;
>     int rgbsel;
> 
2172a2176
>     uiBlockBeginAlign(block);
2174,2190c2178,2202
< 	uiDefButF(block, COL, B_WORLDPRV, "",			10,150,145,19, &wrld->horr, 0, 0, 0, B_COLHOR, "");
< 	uiDefButF(block, COL, B_WORLDPRV, "",			160,150,145,19, &wrld->zenr, 0, 0, 0, B_COLZEN, "");
< 
< 	uiBlockBeginAlign(block);
< 	uiDefButF(block, NUMSLI,B_WORLDPRV,"HoR ",	10,130,145,19,	&(wrld->horr), 0.0, 1.0, B_COLHOR,0, "Sets the amount of red colour at the horizon");
< 	uiDefButF(block, NUMSLI,B_WORLDPRV,"HoG ",	10,110,145,19,	&(wrld->horg), 0.0, 1.0, B_COLHOR,0, "Sets the amount of green colour at the horizon");
< 	uiDefButF(block, NUMSLI,B_WORLDPRV,"HoB ",	10,90,145,19,	&(wrld->horb), 0.0, 1.0, B_COLHOR,0, "Sets the amount of blue colour at the horizon");
< 	
< 	uiBlockBeginAlign(block);
< 	uiDefButF(block, NUMSLI,B_WORLDPRV,"ZeR ",	160,130,145,19,	&(wrld->zenr), 0.0, 1.0, B_COLZEN,0, "Sets the amount of red colour at the zenith");
< 	uiDefButF(block, NUMSLI,B_WORLDPRV,"ZeG ",	160,110,145,19,	&(wrld->zeng), 0.0, 1.0, B_COLZEN,0, "Sets the amount of green colour at the zenith");
< 	uiDefButF(block, NUMSLI,B_WORLDPRV,"ZeB ",	160,90,145,19,	&(wrld->zenb), 0.0, 1.0, B_COLZEN,0, "Sets the amount of blue colour at the zenith");
< 
< 	uiBlockBeginAlign(block);
< 	uiDefButF(block, NUMSLI,B_WORLDPRV,"AmbR ",	10,50,145,19,	&(wrld->ambr), 0.0, 1.0 ,0,0, "Sets the amount of red ambient colour");
< 	uiDefButF(block, NUMSLI,B_WORLDPRV,"AmbG ",	10,30,145,19,	&(wrld->ambg), 0.0, 1.0 ,0,0, "Sets the amount of green ambient colour");
< 	uiDefButF(block, NUMSLI,B_WORLDPRV,"AmbB ",	10,10,145,19,	&(wrld->ambb), 0.0, 1.0 ,0,0, "Sets the amount of blue ambient colour");
---
>     uiDefButF(block, COL, B_WORLDPRV, "",	8,150,72,20, &(wrld->horr), 0, 0, 0, B_MATCOL, "");
>     uiDefButF(block, COL, B_WORLDPRV, "",	8,130,72,20, &(wrld->zenr), 0, 0, 0, B_SPECCOL, "");
>     uiDefButF(block, COL, B_WORLDPRV, "",	8,110,72,20, &(wrld->ambr), 0, 0, 0, B_MIRCOL, "");
> 
>     uiBlockBeginAlign(block);
>     uiDefButC(block, ROW, REDRAWBUTSSHADING, "Hor",			83,150,40,20, &(wrld->rgbsel), 2.0, 0.0, 0, 0, "Sets the horizon colour");
>     uiDefButC(block, ROW, REDRAWBUTSSHADING, "Zen",			83,130,40,20, &(wrld->rgbsel), 2.0, 1.0, 0, 0, "Sets the zenith colour");
>     uiDefButC(block, ROW, REDRAWBUTSSHADING, "Amb",			83,110,40,20, &(wrld->rgbsel), 2.0, 2.0, 0, 0, "Sets the ambient colour");
> 
>     if (wrld->rgbsel == 0) {
>         colpoin = &(wrld->horr);
>         rgbsel = B_COLHOR;
>     } else if (wrld->rgbsel == 1) {
>         colpoin = &(wrld->zenr);
>         rgbsel = B_COLZEN;
>     } else if (wrld->rgbsel == 2) {
>         colpoin = &(wrld->ambr);
>         rgbsel = 0;
>     }
>         
>     uiBlockBeginAlign(block);
>     uiDefButF(block, NUMSLI, B_WORLDPRV, "R ",		128,150,175,19, colpoin  , 0.0, 1.0, rgbsel, 0, "");
>     uiDefButF(block, NUMSLI, B_WORLDPRV, "G ",		128,130,175,19, colpoin+1, 0.0, 1.0, rgbsel, 0, "");
>     uiDefButF(block, NUMSLI, B_WORLDPRV, "B ",		128,110,175,19, colpoin+2, 0.0, 1.0, rgbsel, 0, "");
>     uiBlockEndAlign(block);
2196,2197d2207
< 
< 
Index: source/blender/makesdna/DNA_world_types.h
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/makesdna/DNA_world_types.h,v
retrieving revision 1.20
diff -r1.20 DNA_world_types.h
57a58
>     // for buttons 
105a107,108
> 
>     char rgbsel, padd[7];