[Bf-blender-cvs] [836db3aee80] blender2.8: Add Assign Material option to Special menu (W key)
Antonioya
noreply at git.blender.org
Thu Aug 2 19:35:37 CEST 2018
Commit: 836db3aee80008def4edb5c32c1cd7eccddc862f
Author: Antonioya
Date: Thu Aug 2 19:35:29 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB836db3aee80008def4edb5c32c1cd7eccddc862f
Add Assign Material option to Special menu (W key)
Also some renames and cleanups.
===================================================================
M release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/editors/gpencil/gpencil_ops.c
===================================================================
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 9f2edefc3c2..336e4acfd8f 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -582,59 +582,6 @@ class GPENCIL_MT_separate(Menu):
layout.operator("gpencil.stroke_separate", text="Active Layer").mode = 'LAYER'
-class GPENCIL_MT_gpencil_edit_specials(Menu):
- bl_label = "GPencil Specials"
-
- def draw(self, context):
- layout = self.layout
- is_3d_view = context.space_data.type == 'VIEW_3D'
-
- layout.operator_context = 'INVOKE_REGION_WIN'
-
- layout.operator("gpencil.stroke_subdivide", text="Subdivide")
- layout.operator("gpencil.stroke_simplify_fixed", text="Simplify")
- layout.operator("gpencil.stroke_simplify", text="Simplify Adaptative")
-
- layout.separator()
- layout.menu("GPENCIL_MT_separate", text="Separate")
-
- layout.separator()
- layout.operator("gpencil.stroke_split", text="Split")
-
- layout.separator()
-
- 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")
-
- layout.separator()
- layout.operator("gpencil.frame_duplicate", text="Duplicate Active Frame")
- layout.operator("gpencil.frame_duplicate", text="Duplicate Active Frame All Layers").mode = 'ALL'
-
- if is_3d_view:
- layout.separator()
- layout.operator("gpencil.reproject")
-
-
-class GPENCIL_MT_gpencil_sculpt_specials(Menu):
- bl_label = "GPencil Specials"
-
- def draw(self, context):
- layout = self.layout
- is_3d_view = context.space_data.type == 'VIEW_3D'
-
- layout.operator_context = 'INVOKE_REGION_WIN'
-
- layout.operator("gpencil.frame_duplicate", text="Duplicate Active Frame")
- layout.operator("gpencil.frame_duplicate", text="Duplicate Active Frame All Layers").mode = 'ALL'
-
- layout.separator()
-
- layout.operator("gpencil.stroke_subdivide", text="Subdivide")
- layout.operator("gpencil.stroke_simplify_fixed", text="Simplify")
- layout.operator("gpencil.stroke_simplify", text="Simplify Adaptative")
-
-
class GPENCIL_MT_gpencil_draw_specials(Menu):
bl_label = "GPencil Draw Specials"
@@ -859,8 +806,6 @@ classes = (
GPENCIL_MT_snap,
GPENCIL_MT_separate,
- GPENCIL_MT_gpencil_edit_specials,
- GPENCIL_MT_gpencil_sculpt_specials,
GPENCIL_MT_gpencil_draw_specials,
GPENCIL_MT_gpencil_draw_delete,
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index a6d66f20494..349832cedf2 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3539,6 +3539,7 @@ class VIEW3D_MT_paint_gpencil(Menu):
layout.operator("gpencil.delete", text="Delete Frame").type = 'FRAME'
layout.operator("gpencil.active_frames_delete_all")
+
class VIEW3D_MT_assign_material(Menu):
bl_label = "Assign Material"
@@ -3549,6 +3550,7 @@ class VIEW3D_MT_assign_material(Menu):
for mat in ob.data.materials:
layout.operator("gpencil.stroke_change_color", text=mat.name).material = mat.name
+
class VIEW3D_MT_edit_gpencil(Menu):
bl_label = "Strokes"
@@ -4898,6 +4900,64 @@ class VIEW3D_PT_gpencil_multi_frame(Panel):
layout.template_curve_mapping(settings, "multiframe_falloff_curve", brush=True)
+class VIEW3D_MT_gpencil_edit_specials(Menu):
+ bl_label = "Grease Pencil Specials"
+
+ def draw(self, context):
+ layout = self.layout
+ is_3d_view = context.space_data.type == 'VIEW_3D'
+
+ layout.operator_context = 'INVOKE_REGION_WIN'
+
+ layout.menu("VIEW3D_MT_assign_material")
+ layout.separator()
+
+ layout.operator("gpencil.stroke_subdivide", text="Subdivide")
+ layout.operator("gpencil.stroke_simplify_fixed", text="Simplify")
+ layout.operator("gpencil.stroke_simplify", text="Simplify Adaptative")
+
+ layout.separator()
+ layout.menu("GPENCIL_MT_separate", text="Separate")
+
+ layout.separator()
+ layout.operator("gpencil.stroke_split", text="Split")
+
+ layout.separator()
+
+ 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")
+
+ layout.separator()
+ layout.operator("gpencil.frame_duplicate", text="Duplicate Active Frame")
+ layout.operator("gpencil.frame_duplicate", text="Duplicate Active Frame All Layers").mode = 'ALL'
+
+ if is_3d_view:
+ layout.separator()
+ layout.operator("gpencil.reproject")
+
+
+class VIEW3D_MT_gpencil_sculpt_specials(Menu):
+ bl_label = "Grease Pencil Specials"
+
+ def draw(self, context):
+ layout = self.layout
+ is_3d_view = context.space_data.type == 'VIEW_3D'
+
+ layout.operator_context = 'INVOKE_REGION_WIN'
+ layout.menu("VIEW3D_MT_assign_material")
+ layout.separator()
+
+ layout.operator("gpencil.frame_duplicate", text="Duplicate Active Frame")
+ layout.operator("gpencil.frame_duplicate", text="Duplicate Active Frame All Layers").mode = 'ALL'
+
+ layout.separator()
+
+ layout.operator("gpencil.stroke_subdivide", text="Subdivide")
+ layout.operator("gpencil.stroke_simplify_fixed", text="Simplify")
+ layout.operator("gpencil.stroke_simplify", text="Simplify Adaptative")
+
+
classes = (
VIEW3D_HT_header,
VIEW3D_MT_editor_menus,
@@ -5041,6 +5101,8 @@ classes = (
VIEW3D_PT_object_type_visibility,
VIEW3D_PT_grease_pencil,
VIEW3D_PT_gpencil_multi_frame,
+ VIEW3D_MT_gpencil_edit_specials,
+ VIEW3D_MT_gpencil_sculpt_specials,
VIEW3D_PT_quad_view,
VIEW3D_PT_view3d_stereo,
VIEW3D_PT_shading,
diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index 3a86b0c13ef..b2e1758b169 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -299,7 +299,7 @@ static void ed_keymap_gpencil_sculpt(wmKeyMap *keymap)
RNA_string_set(kmi->ptr, "data_path_primary", "tool_settings.gpencil_sculpt.brush.size");
/* menu sculpt specials */
- WM_keymap_add_menu(keymap, "GPENCIL_MT_gpencil_sculpt_specials", WKEY, KM_PRESS, 0, 0);
+ WM_keymap_add_menu(keymap, "VIEW3D_MT_gpencil_sculpt_specials", WKEY, KM_PRESS, 0, 0);
}
static void ed_keymap_gpencil_weight(wmKeyMap *keymap)
@@ -371,7 +371,7 @@ static void ed_keymap_gpencil_editing(wmKeyConfig *keyconf)
WM_keymap_add_item(keymap, "GPENCIL_OT_active_frames_delete_all", DELKEY, KM_PRESS, KM_SHIFT, 0);
/* menu edit specials */
- WM_keymap_add_menu(keymap, "GPENCIL_MT_gpencil_edit_specials", WKEY, KM_PRESS, 0, 0);
+ WM_keymap_add_menu(keymap, "VIEW3D_MT_gpencil_edit_specials", WKEY, KM_PRESS, 0, 0);
/* menu separate */
WM_keymap_add_menu(keymap, "GPENCIL_MT_separate", PKEY, KM_PRESS, 0, 0);
More information about the Bf-blender-cvs
mailing list