svn merge ^/trunk/blender -r46844:HEAD
[blender-staging.git] / release / scripts / startup / bl_ui / space_view3d_toolbar.py
index e78176fac0fc08aef618b8cc03fd42f943d0bd8b..454541f7069e801c2fc0b9ab7063b6bc067f15b8 100644 (file)
@@ -873,6 +873,8 @@ class VIEW3D_PT_sculpt_options(Panel, View3DPaintPanel):
         layout.prop(sculpt, "show_brush")
         layout.prop(sculpt, "use_deform_only")
 
+        layout.prop(sculpt, "input_samples")
+
         self.unified_paint_settings(layout, context)
 
 
@@ -985,6 +987,8 @@ class VIEW3D_PT_tools_weightpaint_options(Panel, View3DPaintPanel):
             col.prop(mesh, "use_mirror_x")
             col.prop(mesh, "use_mirror_topology")
 
+        col.prop(wpaint, "input_samples")
+        
         self.unified_paint_settings(col, context)
 
 # Commented out because the Apply button isn't an operator yet, making these settings useless
@@ -1015,6 +1019,8 @@ class VIEW3D_PT_tools_vertexpaint(Panel, View3DPaintPanel):
         col.prop(vpaint, "use_normal")
         col.prop(vpaint, "use_spray")
 
+        col.prop(vpaint, "input_samples")
+
         self.unified_paint_settings(col, context)
 
 # Commented out because the Apply button isn't an operator yet, making these settings useless