diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2013-04-16 19:02:41 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2013-04-16 19:02:41 +0400 |
commit | 53c9507c2878b38176c841c4a2172ea7f543aaba (patch) | |
tree | 72ed3397704e272a4a5cc9a60701e21347609b3d /release | |
parent | ea0ad013d35984cba06cd8318fd42cc39c74c37f (diff) |
Option to hide overlay during a stroke. To enable, press the brush icon
next to the overlay alpha.
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/space_image.py | 15 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 20 |
2 files changed, 31 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 24850c431fe..7ea1b7e2c51 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -734,11 +734,13 @@ class IMAGE_PT_tools_brush_texture(BrushButtonsPanel, Panel): row = col.row() if brush.use_texture_overlay: - row.prop(brush, "use_texture_overlay", toggle=True, text="", icon='RESTRICT_VIEW_OFF') + row.prop(brush, "use_primary_overlay", toggle=True, text="", icon='RESTRICT_VIEW_OFF') else: - row.prop(brush, "use_texture_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON') + row.prop(brush, "use_primary_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON') sub = row.row() sub.prop(brush, "texture_overlay_alpha", text="Alpha") + sub.prop(brush, "cursor_overlay_override", toggle=True, text="", icon='BRUSH_DATA') + class IMAGE_PT_tools_mask_texture(BrushButtonsPanel, Panel): @@ -756,6 +758,15 @@ class IMAGE_PT_tools_mask_texture(BrushButtonsPanel, Panel): col.template_ID_preview(brush, "mask_texture", new="texture.new", rows=3, cols=8) brush_mask_texture_settings(col, brush) + if tex_slot_alpha.map_mode != 'STENCIL': + if brush.use_secondary_overlay: + row.prop(brush, "use_secondary_overlay", toggle=True, text="", icon='RESTRICT_VIEW_OFF') + else: + row.prop(brush, "use_secondary_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON') + + sub = row.row() + sub.prop(brush, "texture_overlay_alpha", text="Alpha") + sub.prop(brush, "cursor_overlay_override", toggle=True, text="", icon='BRUSH_DATA') class IMAGE_PT_tools_brush_tool(BrushButtonsPanel, Panel): diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 073a3f70cca..e4817b649e8 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -767,12 +767,13 @@ class VIEW3D_PT_tools_brush_texture(Panel, View3DPaintPanel): row = col.row() if tex_slot.map_mode != 'STENCIL': if brush.use_texture_overlay: - row.prop(brush, "use_texture_overlay", toggle=True, text="", icon='RESTRICT_VIEW_OFF') + row.prop(brush, "use_primary_overlay", toggle=True, text="", icon='RESTRICT_VIEW_OFF') else: - row.prop(brush, "use_texture_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON') + row.prop(brush, "use_primary_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON') sub = row.row() sub.prop(brush, "texture_overlay_alpha", text="Alpha") + sub.prop(brush, "cursor_overlay_override", toggle=True, text="", icon='BRUSH_DATA') class VIEW3D_PT_tools_mask_texture(View3DPanel, Panel): @@ -796,6 +797,21 @@ class VIEW3D_PT_tools_mask_texture(View3DPanel, Panel): col.template_ID_preview(brush, "mask_texture", new="texture.new", rows=3, cols=8) brush_mask_texture_settings(col, brush) + + col = layout.column(align=True) + col.active = brush.brush_capabilities.has_overlay + col.label(text="Overlay:") + + row = col.row() + if tex_slot_alpha.map_mode != 'STENCIL': + if brush.use_secondary_overlay: + row.prop(brush, "use_secondary_overlay", toggle=True, text="", icon='RESTRICT_VIEW_OFF') + else: + row.prop(brush, "use_secondary_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON') + + sub = row.row() + sub.prop(brush, "texture_overlay_alpha", text="Alpha") + sub.prop(brush, "cursor_overlay_override", toggle=True, text="", icon='BRUSH_DATA') class VIEW3D_PT_tools_brush_stroke(Panel, View3DPaintPanel): |