2.5 Lamp Buttons:

* Some layout tweaks and fixes by nudelZ.
This commit is contained in:
Thomas Dinges 2009-07-28 11:04:08 +00:00
parent fee10e5a40
commit f4f3a9b08b

@ -49,10 +49,13 @@ class DATA_PT_lamp(DataButtonsPanel):
split = layout.split() split = layout.split()
col = split.column() col = split.column()
col.itemR(lamp, "color", text="") sub = col.column(align=True)
col.itemR(lamp, "energy") sub.itemR(lamp, "color", text="")
sub.itemR(lamp, "energy")
col.itemR(lamp, "negative") col.itemR(lamp, "negative")
col.itemR(lamp, "distance")
if lamp.type == "AREA":
col.itemR(lamp, "distance")
col = split.column() col = split.column()
col.itemR(lamp, "layer", text="This Layer Only") col.itemR(lamp, "layer", text="This Layer Only")
@ -67,7 +70,7 @@ class DATA_PT_lamp(DataButtonsPanel):
sub = col.column(align=True) sub = col.column(align=True)
sub.itemR(lamp, "falloff_type", text="") sub.itemR(lamp, "falloff_type", text="")
sub.itemR(lamp, "distance") sub.itemR(lamp, "distance")
sub.itemR(lamp, "sphere") col.itemR(lamp, "sphere")
if lamp.falloff_type == 'LINEAR_QUADRATIC_WEIGHTED': if lamp.falloff_type == 'LINEAR_QUADRATIC_WEIGHTED':
col = split.column() col = split.column()
@ -201,20 +204,18 @@ class DATA_PT_shadow(DataButtonsPanel):
elif lamp.type == 'AREA': elif lamp.type == 'AREA':
split = layout.split() split = layout.split()
col = split.column(align=True) col = split.column()
sub = split.column(align=True)
if lamp.shape == 'SQUARE': 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': elif lamp.shape == 'RECTANGLE':
col.itemR(lamp, "shadow_ray_samples_x", text="Samples X") sub.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_y", text="Samples Y")
if lamp.shadow_ray_sampling_method == 'ADAPTIVE_QMC': if lamp.shadow_ray_sampling_method == 'ADAPTIVE_QMC':
col.itemR(lamp, "shadow_adaptive_threshold", text="Threshold") sub.itemR(lamp, "shadow_adaptive_threshold", text="Threshold")
split.column()
elif lamp.shadow_ray_sampling_method == 'CONSTANT_QMC':
split.column()
elif lamp.shadow_ray_sampling_method == 'CONSTANT_JITTERED': elif lamp.shadow_ray_sampling_method == 'CONSTANT_JITTERED':
col = split.column()
col.itemR(lamp, "umbra") col.itemR(lamp, "umbra")
col.itemR(lamp, "dither") col.itemR(lamp, "dither")
col.itemR(lamp, "jitter") col.itemR(lamp, "jitter")