Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2013-08-31 20:36:54 +0400
committerThomas Dinges <blender@dingto.org>2013-08-31 20:36:54 +0400
commitce326e20c85bc91471e681fa77f71be528302af3 (patch)
tree16970c749167446280fe0d190b7052342bcc65bc /intern/cycles
parent5c569d227b6416a287163f643e869792a135f539 (diff)
Cycles:
* World background samples (Branched Path) were missing after integrator rename.
Diffstat (limited to 'intern/cycles')
-rw-r--r--intern/cycles/blender/addon/ui.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 10e3c8cb2ae..18b68ca3e9d 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -911,7 +911,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:
+ if cscene.progressive == 'BRANCHED_PATH':
sub.prop(cworld, "samples")