Revision: 16676
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16676
Author: ton
Date: 2008-09-22 16:52:50 +0200 (Mon, 22 Sep 2008)
Log Message:
-----------
Bugfix:
- Button for 'shadow color' was drawn over 'layer shadow' button...
The shadow+spot panel was cramped... spot shadowbuffer uses all
space. Moved it to the Lamp panel with label, more clear now.
Panel reorg is for later :)
- Small fix: Area Lamp 'gamma' slider didn't update preview.
Unfortunately had to move this slider to smaller button...
Modified Paths:
--------------
trunk/blender/source/blender/src/buttons_shading.c
Modified: trunk/blender/source/blender/src/buttons_shading.c
===================================================================
--- trunk/blender/source/blender/src/buttons_shading.c 2008-09-22 14:01:35 UTC
(rev 16675)
+++ trunk/blender/source/blender/src/buttons_shading.c 2008-09-22 14:52:50 UTC
(rev 16676)
@@ -2672,12 +2672,6 @@
uiDefButBitI(block, TOG, LA_LAYER_SHADOW, B_LAMPPRV,"Layer",
10,90,80,19,&la->mode, 0, 0, 0, 0, "Causes only objects on the same layer to
cast shadows");
uiBlockEndAlign(block);
- if(ELEM4(la->type, LA_AREA, LA_SPOT, LA_SUN, LA_LOCAL) && ((la->mode &
LA_SHAD_RAY)||(la->mode & LA_SHAD_BUF))) {
- uiBlockBeginAlign(block);
- uiDefButF(block, COL, 0, "Shadow ",
10,90,80,19,&la->shdwr, 0, 0, 0, B_COLLAMP, "Sets the shadow color; default is
black (RGB 0,0,0)");
- uiBlockEndAlign(block);
- }
-
if(la->type==LA_SPOT) {
uiBlockBeginAlign(block);
uiDefButBitI(block, TOG, LA_SQUARE, B_LAMPREDRAW,"Square",
10,60,80,19,&la->mode, 0, 0, 0, 0, "Sets square spotbundles");
@@ -2995,8 +2989,17 @@
}
else if(la->type==LA_AREA) {
if(la->k==0.0) la->k= 1.0;
- uiDefButF(block, NUMSLI,0,"Gamma ", 120,10,180,19,&la->k,
0.001, 2.0, 100, 0, "Set the light gamma correction value");
+ uiDefButF(block, NUM,B_LAMPPRV, "Gam. ", 10,95,100,19,
&la->k, 0.001, 2.0, 100, 0, "Set the light gamma correction value");
}
+ uiBlockEndAlign(block);
+
+ if(ELEM4(la->type, LA_AREA, LA_SPOT, LA_SUN, LA_LOCAL) && ((la->mode &
LA_SHAD_RAY)||(la->mode & LA_SHAD_BUF))) {
+
+ uiDefBut(block, LABEL, 0, "Shadow Color",
120, 32, 180, 20, 0, 0.0, 0.0, 0, 0, "");
+ uiBlockBeginAlign(block);
+ uiDefButF(block, COL, 0, "Shadow ",
120,10,180,22,&la->shdwr, 0, 0, 0, B_COLLAMP, "Sets the shadow color; default
is black (RGB 0,0,0)");
+
+ }
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
