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:
authorAaron Carlisle <carlisle.b3d@gmail.com>2017-03-28 23:29:20 +0300
committerAaron Carlisle <carlisle.b3d@gmail.com>2017-03-28 23:33:05 +0300
commit93426cb295c53f1af01451c6f6fad29afe05bb5e (patch)
tree84116cb5012d70abc6d4a3117a6d5c2399877c41
parent6ea54fe9ffe2b2514990fdf3489ca53d05ce449a (diff)
Fix T51068: Place props in their own row
This allows the props to extend into the blank space that is to the right.
-rw-r--r--intern/cycles/blender/addon/ui.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index bb45e75536c..6e25e44a5c2 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -183,11 +183,6 @@ class CyclesRender_PT_sampling(CyclesButtonsPanel, Panel):
else:
sub.label(text="AA Samples:")
sub.prop(cscene, "aa_samples", text="Render")
- sub.prop(cscene, "preview_aa_samples", text="Preview")
- sub.separator()
- sub.prop(cscene, "sample_all_lights_direct")
- sub.prop(cscene, "sample_all_lights_indirect")
-
col = split.column()
sub = col.column(align=True)
sub.label(text="Samples:")
@@ -203,6 +198,10 @@ class CyclesRender_PT_sampling(CyclesButtonsPanel, Panel):
sub.prop(cscene, "subsurface_samples", text="Subsurface")
sub.prop(cscene, "volume_samples", text="Volume")
+ col = layout.column(align=True)
+ col.prop(cscene, "sample_all_lights_direct")
+ col.prop(cscene, "sample_all_lights_indirect")
+
if not (use_opencl(context) and cscene.feature_set != 'EXPERIMENTAL'):
layout.row().prop(cscene, "sampling_pattern", text="Pattern")