Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles / Sampling UI:

Browse Source 
* Do not show Total Samples print for Progressive, when Square Samples are disabled. In this case it's obvious even without the print. :)
This commit is contained in:
Thomas Dinges
2013-08-23 11:39:48 +00:00
parent 81096bab0c
commit e203c4c390
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
intern/cycles/blender/addon/ui.py
View File

@@ -73,18 +73,20 @@ def draw_samples_info(layout, cscene):
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):