diff options
author | Thomas Dinges <blender@dingto.org> | 2009-07-21 00:34:14 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2009-07-21 00:34:14 +0400 |
commit | c72064272f7ef64070339a7622dc7305007de8c2 (patch) | |
tree | 323068f07b4816e68368c3b591f63c0d1cd49af2 /release/ui/buttons_data_lamp.py | |
parent | 9a9d118bbf7786b1c5c412bef651885e33709553 (diff) |
2.5 Lamps:
* Replaced RNA ENUM hacks for "shadow method" and "shadow_ray_sampling_method" with modifications in the layout file.
Diffstat (limited to 'release/ui/buttons_data_lamp.py')
-rw-r--r-- | release/ui/buttons_data_lamp.py | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/release/ui/buttons_data_lamp.py b/release/ui/buttons_data_lamp.py index b70734d2fa5..aa1b9db8334 100644 --- a/release/ui/buttons_data_lamp.py +++ b/release/ui/buttons_data_lamp.py @@ -124,10 +124,7 @@ class DATA_PT_sky(DataButtonsPanel): col.itemR(lamp, "sun_brightness", text="Brightness") col.itemR(lamp, "sun_size", text="Size") col.itemR(lamp, "backscattered_light", text="Back Light") - - - class DATA_PT_atmosphere(DataButtonsPanel): __idname__ = "DATA_PT_atmosphere" __label__ = "Atmosphere" @@ -168,10 +165,15 @@ class DATA_PT_shadow(DataButtonsPanel): def draw(self, context): layout = self.layout lamp = context.lamp - - layout.itemR(lamp, "shadow_method", expand=True) - if lamp.shadow_method in ('BUFFER_SHADOW', 'RAY_SHADOW'): + row = layout.row(align=True) + row.item_enumR(lamp, "shadow_method", 'NOSHADOW') + row.item_enumR(lamp, "shadow_method", 'RAY_SHADOW') + if lamp.type == 'SPOT': + row.item_enumR(lamp, "shadow_method", 'BUFFER_SHADOW') + + + if lamp.shadow_method != 'NOSHADOW': split = layout.split() @@ -184,9 +186,12 @@ class DATA_PT_shadow(DataButtonsPanel): if lamp.shadow_method == 'RAY_SHADOW': - col = layout.column() - col.itemL(text="Sampling:") - col.row().itemR(lamp, "shadow_ray_sampling_method", expand=True) + row = layout.row(align=True) + layout.itemL(text="Sampling:") + row.item_enumR(lamp, "shadow_ray_sampling_method", 'ADAPTIVE_QMC') + row.item_enumR(lamp, "shadow_ray_sampling_method", 'CONSTANT_QMC') + if lamp.type == 'AREA': + row.item_enumR(lamp, "shadow_ray_sampling_method", 'CONSTANT_JITTERED') if lamp.type in ('POINT', 'SUN', 'SPOT'): flow = layout.column_flow() @@ -206,10 +211,10 @@ class DATA_PT_shadow(DataButtonsPanel): flow.itemR(lamp, "jitter") if lamp.shadow_method == 'BUFFER_SHADOW': - col = layout.column() - col.itemL(text="Buffer Type:") - col.row().itemR(lamp, "shadow_buffer_type", expand=True) - + row = layout.row(align=True) + row.itemL(text="Buffer Type:") + layout.itemR(lamp, "shadow_buffer_type", expand=True) + if lamp.shadow_buffer_type in ('REGULAR', 'HALFWAY'): flow = layout.column_flow() flow.itemL(text="Sample Buffers:") |