diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2019-08-26 16:46:00 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2019-08-26 16:49:16 +0300 |
commit | 51d9f56f874d2aeea0dc8bc256eb9e12d1726187 (patch) | |
tree | 698d20c0f3936a95f5e8973ad1b43f5125810b17 /release/scripts | |
parent | 742119bcb50a83b7f8bb6ceefb34861ac54d9cc8 (diff) |
GPencil: Invert Paste operator and make Paste to Active default
Before there were two options: Paste to original layer called "Paste" and Paste to active layer called "Paste & Merge"
Now, by default the paste is in active layer and the "Paste & Merge" has been renamed "Paste".
For old "Paste", now is called "Paste by Layer" and it's not the default value anymore.
Note: Minor edits to add icons not present in Differential revision.
Differential Revision: https://developer.blender.org/D5591
Diffstat (limited to 'release/scripts')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_grease_pencil_common.py | 9 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 8 |
2 files changed, 9 insertions, 8 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 6f089f93f00..46e969b3959 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -169,8 +169,8 @@ class GreasePencilStrokeEditPanel: layout.label(text="Edit:") row = layout.row(align=True) row.operator("gpencil.copy", text="Copy") - row.operator("gpencil.paste", text="Paste").type = 'COPY' - row.operator("gpencil.paste", text="Paste & Merge").type = 'MERGE' + row.operator("gpencil.paste", text="Paste").type = 'ACTIVE' + row.operator("gpencil.paste", text="Paste by Layer").type = 'LAYER' col = layout.column(align=True) col.operator("gpencil.delete") @@ -507,8 +507,9 @@ class GPENCIL_MT_pie_tools_more(Menu): # gpd = context.gpencil_data col = pie.column(align=True) - col.operator("gpencil.copy", icon='COPYDOWN', text="Copy") - col.operator("gpencil.paste", icon='PASTEDOWN', text="Paste") + col.operator("gpencil.copy", text="Copy", icon='COPYDOWN') + col.operator("gpencil.paste", text="Paste", icon='PASTEDOWN').type = 'ACTIVE' + col.operator("gpencil.paste", text="Paste by Layer").type = 'LAYER' col = pie.column(align=True) col.operator("gpencil.select_more", icon='ADD') diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index b684e4aa2dd..22c1a74b7e4 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -4460,8 +4460,8 @@ class VIEW3D_MT_edit_gpencil(Menu): layout.operator("gpencil.duplicate_move", text="Duplicate") layout.operator("gpencil.stroke_split", text="Split") layout.operator("gpencil.copy", text="Copy", icon='COPYDOWN') - layout.operator("gpencil.paste", text="Paste", icon='PASTEDOWN').type = 'COPY' - layout.operator("gpencil.paste", text="Paste & Merge").type = 'MERGE' + layout.operator("gpencil.paste", text="Paste", icon='PASTEDOWN').type = 'ACTIVE' + layout.operator("gpencil.paste", text="Paste by Layer").type = 'LAYER' layout.separator() @@ -6306,8 +6306,8 @@ class VIEW3D_MT_gpencil_edit_context_menu(Menu): layout.operator("gpencil.duplicate_move", text="Duplicate") layout.operator("gpencil.copy", text="Copy", icon='COPYDOWN') - layout.operator("gpencil.paste", text="Paste", icon='PASTEDOWN').type = 'COPY' - layout.operator("gpencil.paste", text="Paste & Merge").type = 'MERGE' + layout.operator("gpencil.paste", text="Paste", icon='PASTEDOWN').type = 'ACTIVE' + layout.operator("gpencil.paste", text="Paste by Layer").type = 'LAYER' layout.menu("VIEW3D_MT_gpencil_copy_layer") layout.operator("gpencil.frame_duplicate", text="Duplicate Active Frame") layout.operator("gpencil.frame_duplicate", text="Duplicate Active Frame All Layers").mode = 'ALL' |