Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonioya <blendergit@gmail.com>2018-12-30 15:08:04 +0300
committerAntonioya <blendergit@gmail.com>2018-12-30 15:08:04 +0300
commitd273e84c41bb0de9395458436bf2fc192585d398 (patch)
treea82616d024347c254792dd205e6116c64c784ea1 /release/scripts
parent543ddbe6bfa8072b4c09ccc9abe27237d3598db5 (diff)
GP: Mew Merge Strokes operator
This operator allows to create a new stroke joining several selected points of different strokes. The new stroke will use the current material. To use, first select the points to be merged. Optionally can remove the old points and strokes. The operator is available in Edit mode in the Specials menu and Stroke menu.
Diffstat (limited to 'release/scripts')
-rw-r--r--release/scripts/startup/bl_ui/properties_grease_pencil_common.py1
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py2
2 files changed, 3 insertions, 0 deletions
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 be335469418..8e29e03a8f6 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -217,6 +217,7 @@ class GreasePencilStrokeEditPanel:
col.separator()
row = col.row(align=True)
+ row.operator("gpencil.stroke_merge", text="Merge")
row.operator("gpencil.stroke_join", text="Join").type = 'JOIN'
row.operator("gpencil.stroke_join", text="& Copy").type = 'JOINCOPY'
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 93f772785a5..9c2f25b4fb1 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3935,6 +3935,7 @@ class VIEW3D_MT_edit_gpencil(Menu):
layout.operator_menu_enum("gpencil.stroke_separate", "mode", text="Separate...")
layout.operator("gpencil.stroke_split", text="Split")
+ layout.operator("gpencil.stroke_merge", text="Merge")
layout.operator_menu_enum("gpencil.stroke_join", "type", text="Join...")
layout.operator("gpencil.stroke_flip", text="Flip Direction")
@@ -5558,6 +5559,7 @@ class VIEW3D_MT_gpencil_edit_specials(Menu):
layout.separator()
+ layout.operator("gpencil.stroke_merge", text="Merge")
layout.operator("gpencil.stroke_join", text="Join").type = 'JOIN'
layout.operator("gpencil.stroke_join", text="Join & Copy").type = 'JOINCOPY'
layout.operator("gpencil.stroke_flip", text="Flip Direction")