Page MenuHome
Files F10554

area_lamp_samples.diff
Public
Actions

Authored By
mindrones
Nov 13 2013, 2:15 PM
Size
5 KB
Subscribers
None

area_lamp_samples.diff
View Options

Index: release/scripts/ui/properties_data_lamp.py
===================================================================
--- release/scripts/ui/properties_data_lamp.py (revision 31065)
+++ release/scripts/ui/properties_data_lamp.py (working copy)
@@ -220,6 +220,23 @@
else:
layout.prop(lamp, "shadow_method", text="")
+ if lamp.shadow_method == 'NOSHADOW' and lamp.type == 'AREA':
+ split = layout.split()
+
+ col= split.column()
+ col.label(text="Form factor sampling:")
+
+ if wide_ui:
+ sub=col.row(align=True)
+ else:
+ sub=col.column(align=True)
+
+ if lamp.shape == 'SQUARE':
+ sub.prop(lamp, "shadow_ray_samples_x", text="Samples")
+ elif lamp.shape == 'RECTANGLE':
+ sub.prop(lamp, "shadow_ray_samples_x", text="Samples X")
+ sub.prop(lamp, "shadow_ray_samples_y", text="Samples Y")
+
if lamp.shadow_method != 'NOSHADOW':
split = layout.split()
@@ -232,52 +249,52 @@
col.prop(lamp, "only_shadow")
if lamp.shadow_method == 'RAY_SHADOW':
- col = layout.column()
+ split = layout.split()
+
+ col = split.column()
col.label(text="Sampling:")
+
+ if lamp.type in ('POINT', 'SUN', 'SPOT'):
+ if wide_ui:
+ sub=col.row()
+ else:
+ sub=col.column()
+
+ sub.prop(lamp, "shadow_ray_samples", text="Samples")
+ sub.prop(lamp, "shadow_soft_size", text="Soft Size")
+
+ elif lamp.type == 'AREA':
+ if wide_ui:
+ sub=col.row(align=True)
+ else:
+ sub=col.column(align=True)
+
+ if lamp.shape == 'SQUARE':
+ sub.prop(lamp, "shadow_ray_samples_x", text="Samples")
+ elif lamp.shape == 'RECTANGLE':
+ sub.prop(lamp, "shadow_ray_samples_x", text="Samples X")
+ sub.prop(lamp, "shadow_ray_samples_y", text="Samples Y")
+
if wide_ui:
col.row().prop(lamp, "shadow_ray_sampling_method", expand=True)
else:
- col.prop(lamp, "shadow_ray_sampling_method", text="")
+ col.prop(lamp, "shadow_ray_sampling_method", text="")
- if lamp.type in ('POINT', 'SUN', 'SPOT'):
- split = layout.split()
-
- col = split.column()
- col.prop(lamp, "shadow_soft_size", text="Soft Size")
-
- col.prop(lamp, "shadow_ray_samples", text="Samples")
- if lamp.shadow_ray_sampling_method == 'ADAPTIVE_QMC':
- col.prop(lamp, "shadow_adaptive_threshold", text="Threshold")
+ split = layout.split()
+ col = split.column()
+
+ if lamp.shadow_ray_sampling_method == 'ADAPTIVE_QMC':
+ col.prop(lamp, "shadow_adaptive_threshold", text="Threshold")
if wide_ui:
col = split.column()
-
- elif lamp.type == 'AREA':
- split = layout.split()
-
+
+ if lamp.type == 'AREA' and lamp.shadow_ray_sampling_method == 'CONSTANT_JITTERED':
col = split.column()
+ col = split.column()
+ col.prop(lamp, "umbra")
+ col.prop(lamp, "dither")
+ col.prop(lamp, "jitter")
- if lamp.shape == 'SQUARE':
- col.prop(lamp, "shadow_ray_samples_x", text="Samples")
- elif lamp.shape == 'RECTANGLE':
- col.prop(lamp, "shadow_ray_samples_x", text="Samples X")
- col.prop(lamp, "shadow_ray_samples_y", text="Samples Y")
-
- if lamp.shadow_ray_sampling_method == 'ADAPTIVE_QMC':
- col.prop(lamp, "shadow_adaptive_threshold", text="Threshold")
- if wide_ui:
- col = split.column()
-
- elif lamp.shadow_ray_sampling_method == 'CONSTANT_JITTERED':
- if wide_ui:
- col = split.column()
- col.prop(lamp, "umbra")
- col.prop(lamp, "dither")
- col.prop(lamp, "jitter")
- else:
- if wide_ui:
- col = split.column()
-
-
elif lamp.shadow_method == 'BUFFER_SHADOW':
col = layout.column()
col.label(text="Buffer Type:")
@@ -335,16 +352,21 @@
return (lamp and lamp.type == 'AREA') and (engine in self.COMPAT_ENGINES)
def draw(self, context):
- layout = self.layout
-
lamp = context.lamp
+ wide_ui = context.region.width > narrowui
+ layout = self.layout
split = layout.split()
col = split.column()
- col.row().prop(lamp, "shape", expand=True)
+
+ if wide_ui:
+ col.row().prop(lamp, "shape", expand=True)
+ sub = col.row(align=True)
+ else:
+ col.prop(lamp, "shape", text="")
+ sub = col.column(align=True)
- sub = col.column(align=True)
if (lamp.shape == 'SQUARE'):
sub.prop(lamp, "size")
elif (lamp.shape == 'RECTANGLE'):

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
c0/6a/d689c51640a8fbf778754b86883a

Event Timeline