[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59693] trunk/blender/intern/cycles/ blender/addon/ui.py: Cycles:

[Thomas Dinges]

Revision: 59693
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59693
Author:   dingto
Date:     2013-08-31 16:36:54 +0000 (Sat, 31 Aug 2013)
Log Message:
-----------
Cycles:
* World background samples (Branched Path) were missing after integrator rename. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/addon/ui.py

Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py	2013-08-31 14:07:05 UTC (rev 59692)
+++ trunk/blender/intern/cycles/blender/addon/ui.py	2013-08-31 16:36:54 UTC (rev 59693)
@@ -911,7 +911,7 @@
         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")