[Bf-blender-cvs] [6c8485ceec4] greasepencil-object: UI: Add additive drawing option to top header

Antonioya noreply at git.blender.org
Fri Jul 27 13:13:52 CEST 2018


Commit: 6c8485ceec4e8c9b6a645773b0e5ed6d9facee43
Author: Antonioya
Date:   Fri Jul 27 13:13:42 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB6c8485ceec4e8c9b6a645773b0e5ed6d9facee43

UI: Add additive drawing option to top header

This option was a menu option and must be a switch.

===================================================================

M	release/scripts/startup/bl_ui/space_topbar.py
M	release/scripts/startup/bl_ui/space_view3d.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index 73b94968f95..29de6be4c78 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -172,6 +172,8 @@ class TOPBAR_HT_lower_bar(Header):
             layout.prop(context.tool_settings, "gpencil_stroke_placement_view3d", text='')
             if context.tool_settings.gpencil_stroke_placement_view3d in ('ORIGIN', 'CURSOR'):
                 layout.prop(context.tool_settings.gpencil_sculpt, "lockaxis", text='')
+            layout.prop(context.tool_settings, "use_gpencil_additive_drawing", text="", icon='FREEZE')
+
         elif mode == 'GPENCIL_SCULPT':
             layout.prop(context.tool_settings.gpencil_sculpt, "lockaxis", text='')
 
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 5cbe3346a96..f287c146f3f 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3540,7 +3540,6 @@ class VIEW3D_MT_paint_gpencil(Menu):
         layout.operator("gpencil.active_frames_delete_all")
 
 
-
 class VIEW3D_MT_edit_gpencil(Menu):
     bl_label = "Strokes"
 
@@ -3671,8 +3670,6 @@ class VIEW3D_MT_gpencil_animation(Menu):
         layout.operator("gpencil.frame_duplicate", text="Duplicate Active Frame")
         layout.operator("gpencil.frame_duplicate", text="Duplicate All Layers").mode = 'ALL'
 
-        # layout.separator()
-        # layout.prop(context.tool_settings, "use_gpencil_additive_drawing", text="Additive Drawing")
 
 class VIEW3D_MT_edit_gpencil_transform(Menu):
     bl_label = "Transform"



More information about the Bf-blender-cvs mailing list