diff options
| author | Thomas Dinges <blender@dingto.org> | 2009-07-28 15:04:08 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2009-07-28 15:04:08 +0400 |
| commit | f4f3a9b08b04077e6e9272e4fdd4cd550b47be02 (patch) | |
| tree | 1e64b9f88fa2ad09a18195c25099a1f41a70d30f /release/ui/buttons_data_lamp.py | |
| parent | fee10e5a400762a556db7167f8a1e55ed1dfd1ff (diff) | |
2.5 Lamp Buttons:
* Some layout tweaks and fixes by nudelZ.
Diffstat (limited to 'release/ui/buttons_data_lamp.py')
| -rw-r--r-- | release/ui/buttons_data_lamp.py | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/release/ui/buttons_data_lamp.py b/release/ui/buttons_data_lamp.py index abe78aca28f..4a61684c8e2 100644 --- a/release/ui/buttons_data_lamp.py +++ b/release/ui/buttons_data_lamp.py @@ -49,10 +49,13 @@ class DATA_PT_lamp(DataButtonsPanel): split = layout.split() col = split.column() - col.itemR(lamp, "color", text="") - col.itemR(lamp, "energy") + sub = col.column(align=True) + sub.itemR(lamp, "color", text="") + sub.itemR(lamp, "energy") col.itemR(lamp, "negative") - col.itemR(lamp, "distance") + + if lamp.type == "AREA": + col.itemR(lamp, "distance") col = split.column() col.itemR(lamp, "layer", text="This Layer Only") @@ -67,7 +70,7 @@ class DATA_PT_lamp(DataButtonsPanel): sub = col.column(align=True) sub.itemR(lamp, "falloff_type", text="") sub.itemR(lamp, "distance") - sub.itemR(lamp, "sphere") + col.itemR(lamp, "sphere") if lamp.falloff_type == 'LINEAR_QUADRATIC_WEIGHTED': col = split.column() @@ -201,20 +204,18 @@ class DATA_PT_shadow(DataButtonsPanel): elif lamp.type == 'AREA': split = layout.split() - col = split.column(align=True) + col = split.column() + sub = split.column(align=True) if lamp.shape == 'SQUARE': - col.itemR(lamp, "shadow_ray_samples_x", text="Samples") + sub.itemR(lamp, "shadow_ray_samples_x", text="Samples") elif lamp.shape == 'RECTANGLE': - col.itemR(lamp, "shadow_ray_samples_x", text="Samples X") - col.itemR(lamp, "shadow_ray_samples_y", text="Samples Y") + sub.itemR(lamp, "shadow_ray_samples_x", text="Samples X") + sub.itemR(lamp, "shadow_ray_samples_y", text="Samples Y") if lamp.shadow_ray_sampling_method == 'ADAPTIVE_QMC': - col.itemR(lamp, "shadow_adaptive_threshold", text="Threshold") - split.column() - elif lamp.shadow_ray_sampling_method == 'CONSTANT_QMC': - split.column() + sub.itemR(lamp, "shadow_adaptive_threshold", text="Threshold") + elif lamp.shadow_ray_sampling_method == 'CONSTANT_JITTERED': - col = split.column() col.itemR(lamp, "umbra") col.itemR(lamp, "dither") col.itemR(lamp, "jitter") |