From 1f4fa869e4877202fd91825f85be748fc3dfe50b Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 21 Jul 2009 00:55:20 +0000 Subject: 2.5: RNA & UI * Revert lamp sampling/buffers change. The right enum items should be defined in RNA, not the layout, so that it works in outliner, python api too. * Also changed type popup to radio buttons again, and removed the icons. This is more consistent, and I don't think it's a good idea to start using icons for these things, too much clutter. * Replace Mesh with Normals panel in the mesh buttons. * Remove Material panel from mesh buttons. * Added name fields for shape/vgroup/vcol/uv. * Spacing tweak to Object and Bone names. * Fix some naming conflicts in RNA, with "name" and "type" properties being defined twice in the same struct. * context.scene.tool_settings -> context.tool_settings. --- release/ui/buttons_data_lamp.py | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'release/ui/buttons_data_lamp.py') diff --git a/release/ui/buttons_data_lamp.py b/release/ui/buttons_data_lamp.py index aa1b9db8334..2155830e568 100644 --- a/release/ui/buttons_data_lamp.py +++ b/release/ui/buttons_data_lamp.py @@ -48,9 +48,7 @@ class DATA_PT_lamp(DataButtonsPanel): lamp = context.lamp - split = layout.split(percentage=0.2) - split.itemL(text="Type:") - split.itemR(lamp, "type", text="") + layout.itemR(lamp, "type", expand=True) split = layout.split() @@ -165,13 +163,8 @@ class DATA_PT_shadow(DataButtonsPanel): def draw(self, context): layout = self.layout lamp = context.lamp - - 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') - + + layout.itemR(lamp, "shadow_method", expand=True) if lamp.shadow_method != 'NOSHADOW': @@ -186,12 +179,9 @@ class DATA_PT_shadow(DataButtonsPanel): if lamp.shadow_method == 'RAY_SHADOW': - 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') + col = layout.column() + col.itemL(text="Sampling:") + col.row().itemR(lamp, "shadow_ray_sampling_method", expand=True) if lamp.type in ('POINT', 'SUN', 'SPOT'): flow = layout.column_flow() -- cgit v1.2.3