[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59416] trunk/blender/intern/cycles/ blender/addon/ui.py: Cycles / Sampling UI:
Thomas Dinges
blender at dingto.org
Fri Aug 23 13:39:48 CEST 2013
Revision: 59416
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59416
Author: dingto
Date: 2013-08-23 11:39:48 +0000 (Fri, 23 Aug 2013)
Log Message:
-----------
Cycles / Sampling UI:
* Do not show Total Samples print for Progressive, when Square Samples are disabled. In this case it's obvious even without the print. :)
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-23 11:28:33 UTC (rev 59415)
+++ trunk/blender/intern/cycles/blender/addon/ui.py 2013-08-23 11:39:48 UTC (rev 59416)
@@ -73,18 +73,20 @@
sss = sss * sss
# Draw interface
- col = layout.column(align=True)
- col.scale_y = 0.6
- col.label("Total Samples:")
- col.separator()
- if cscene.progressive:
- col.label("%s AA" % aa)
- else:
- col.label("%s AA, %s Diffuse, %s Glossy, %s Transmission" %
- (aa, d * aa, g * aa, t * aa))
+ # Do not draw for progressive, when Square Samples are disabled
+ if (not cscene.progressive) or (cscene.use_square_samples and cscene.progressive):
+ col = layout.column(align=True)
+ col.scale_y = 0.6
+ col.label("Total Samples:")
col.separator()
- col.label("%s AO, %s Mesh Light, %s Subsurface" %
- (ao * aa, ml * aa, sss * aa))
+ if cscene.progressive:
+ col.label("%s AA" % aa)
+ else:
+ col.label("%s AA, %s Diffuse, %s Glossy, %s Transmission" %
+ (aa, d * aa, g * aa, t * aa))
+ col.separator()
+ col.label("%s AO, %s Mesh Light, %s Subsurface" %
+ (ao * aa, ml * aa, sss * aa))
class CyclesRender_PT_sampling(CyclesButtonsPanel, Panel):
More information about the Bf-blender-cvs
mailing list