[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59494] branches/soc-2013-paint/release/ scripts/startup/bl_ui/space_view3d_toolbar.py: Fix some merge collisions

[Antony Riakiotakis]

Revision: 59494
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59494
Author:   psy-fi
Date:     2013-08-25 14:16:02 +0000 (Sun, 25 Aug 2013)
Log Message:
-----------
Fix some merge collisions

Modified Paths:
--------------
    branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d_toolbar.py

Modified: branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2013-08-25 14:15:55 UTC (rev 59493)
+++ branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2013-08-25 14:16:02 UTC (rev 59494)
@@ -676,19 +676,6 @@
                 
                 col.prop(brush, "gravity", slider=True)
 
-            col = layout.column(align=True)
-            col.label(text="Overlay:")
-
-            row = col.row(align=True)
-            if brush.use_cursor_overlay:
-                row.prop(brush, "use_cursor_overlay", toggle=True, text="", icon='RESTRICT_VIEW_OFF')
-            else:
-                row.prop(brush, "use_cursor_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON')
-
-            sub = row.row(align=True)
-            sub.prop(brush, "cursor_overlay_alpha", text="Alpha")
-            sub.prop(brush, "use_cursor_overlay_override", toggle=True, text="", icon='BRUSH_DATA')
-
         # Texture Paint Mode #
 
         elif context.image_paint_object and brush:
@@ -755,19 +742,6 @@
                 col.separator()
                 col.prop(brush, "use_accumulate")
 
-            col = layout.column(align=True)
-            col.label(text="Overlay:")
-
-            row = col.row(align=True)
-            if brush.use_cursor_overlay:
-                row.prop(brush, "use_cursor_overlay", toggle=True, text="", icon='RESTRICT_VIEW_OFF')
-            else:
-                row.prop(brush, "use_cursor_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON')
-
-            sub = row.row(align=True)
-            sub.prop(brush, "cursor_overlay_alpha", text="Alpha")
-            sub.prop(brush, "use_cursor_overlay_override", toggle=True, text="", icon='BRUSH_DATA')
-
         # Weight Paint Mode #
         elif context.weight_paint_object and brush: