Merged revision(s) 58785-58855 from trunk/blender into soc-2013-dingto.
authorThomas Dinges <blender@dingto.org>
Sat, 3 Aug 2013 12:49:08 +0000 (12:49 +0000)
committerThomas Dinges <blender@dingto.org>
Sat, 3 Aug 2013 12:49:08 +0000 (12:49 +0000)
1  2 
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_sync.cpp

index b32b9ef48a4bf0145a8e76bb79627be29a99b0f5,411bd5b8b27123b49a5c1dbaf9c7aab8dd2926d0..1d54915dd35be6638769fc0b1800dfec857ebd70
@@@ -67,8 -67,12 +67,10 @@@ class CyclesRender_PT_sampling(CyclesBu
          row.operator("render.cycles_sampling_preset_add", text="", icon="ZOOMOUT").remove_active = True
  
          row = layout.row()
 -        sub = row.row()
 -        sub.active = (device_type == 'NONE' or cscene.device == 'CPU')
 -        sub.prop(cscene, "progressive")
 +        row.prop(cscene, "progressive")
-         row.prop(cscene, "squared_samples")
+         
+         if not cscene.progressive:
+             row.prop(cscene, "squared_samples")
          
          split = layout.split()