diff options
author | Thomas Dinges <blender@dingto.org> | 2012-09-21 17:32:52 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2012-09-21 17:32:52 +0400 |
commit | b170eda2d641b5a22a6ef4dc05373408e3ee2a81 (patch) | |
tree | 757a0422be82aac38278d85c631d702e5860b466 | |
parent | 1a4b9cd39dd8296f45e28dfc977e4d2ef926f7ff (diff) |
Cycles UI:
* Followup for r50550, added checks to the "Samples" Button in World and Lamp Context to properly show the correct options.
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 1aef36e0988..862a436b565 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -513,6 +513,7 @@ class CyclesLamp_PT_lamp(CyclesButtonsPanel, Panel): lamp = context.lamp clamp = lamp.cycles cscene = context.scene.cycles + device_type = context.user_preferences.system.compute_device_type layout.prop(lamp, "type", expand=True) @@ -531,7 +532,7 @@ class CyclesLamp_PT_lamp(CyclesButtonsPanel, Panel): sub.prop(lamp, "size", text="Size X") sub.prop(lamp, "size_y", text="Size Y") - if not cscene.progressive and cscene.device == 'CPU': + if not cscene.progressive and (device_type == 'NONE' or cscene.device == 'CPU'): col.prop(clamp, "samples") col = split.column() @@ -656,6 +657,7 @@ class CyclesWorld_PT_settings(CyclesButtonsPanel, Panel): world = context.world cworld = world.cycles cscene = context.scene.cycles + device_type = context.user_preferences.system.compute_device_type col = layout.column() @@ -663,7 +665,7 @@ class CyclesWorld_PT_settings(CyclesButtonsPanel, Panel): sub = col.row(align=True) sub.active = cworld.sample_as_light sub.prop(cworld, "sample_map_resolution") - if not cscene.progressive and cscene.device == 'CPU': + if not cscene.progressive and (device_type == 'NONE' or cscene.device == 'CPU'): sub.prop(cworld, "samples") |