svn merge -r37793:37865 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / release / scripts / startup / bl_ui / space_view3d_toolbar.py
index 52eb76d071032d303663c89123b061ffb5269af2..ac47380d363410ecee60463fda75a91575a0753e 100644 (file)
@@ -639,6 +639,8 @@ class VIEW3D_PT_tools_brush(PaintPanel, bpy.types.Panel):
         elif context.weight_paint_object and brush:
             layout.prop(context.tool_settings, "vertex_group_weight", text="Weight", slider=True)
             layout.prop(context.tool_settings, "use_auto_normalize", text="Auto Normalize")
+            # Jason was here
+            layout.prop(context.tool_settings, "use_multipaint", text="Multi-Paint")
 
             col = layout.column()