[Bf-blender-cvs] [f9d625a1a16] greasepencil-object: UI: Move additive drawing to animation tab

[Antonio Vazquez]

Commit: f9d625a1a165d96a829b3f434fada5d7b612bcd7
Author: Antonio Vazquez
Date:   Sun Jul 2 18:49:50 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBf9d625a1a165d96a829b3f434fada5d7b612bcd7

UI: Move additive drawing to animation tab

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

M	release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M	release/scripts/startup/bl_ui/space_view3d_toolbar.py

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

diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 14cecd87693..73727835f10 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -103,7 +103,6 @@ class GreasePencilDrawingToolsPanel:
         col.separator()
 
         sub = col.column(align=True)
-        sub.prop(context.tool_settings, "use_gpencil_additive_drawing", text="Additive Drawing")
         if not is_3d_view:
             sub.prop(context.tool_settings, "use_gpencil_continuous_drawing", text="Continuous Drawing")
 
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index a87fa6e0f79..857b34a9aa2 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -298,6 +298,9 @@ class VIEW3D_PT_tools_animation(View3DPanel, Panel):
         row.operator("gpencil.blank_frame_add", icon='NEW')
         row.operator("gpencil.active_frames_delete_all", icon='X', text="Delete Frame(s)")
 
+        row.separator()
+        row = layout.row(align=True)
+        row.prop(context.tool_settings, "use_gpencil_additive_drawing", text="Additive Drawing")
 
 class VIEW3D_PT_tools_rigid_body(View3DPanel, Panel):
     bl_category = "Physics"