[Bf-blender-cvs] [19764a20c46] greasepencil-object: Enable Multiedit in Weight Paint mode

[Antonio Vazquez]

Commit: 19764a20c46c2986da3b117a1f93de23b01b277a
Author: Antonio Vazquez
Date:   Mon Sep 4 11:42:45 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB19764a20c46c2986da3b117a1f93de23b01b277a

Enable Multiedit in Weight Paint mode

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

M	release/scripts/startup/bl_ui/space_view3d.py
M	source/blender/editors/include/ED_gpencil.h

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 29353ff3963..82104ab199f 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -148,8 +148,9 @@ class VIEW3D_HT_header(Header):
                     row.separator()
                     row.prop(toolsettings.gpencil_sculpt, "lockaxis", text='')
 
-        if context.gpencil_data:
-            if context.gpencil_data.use_stroke_edit_mode:
+        gpd = context.gpencil_data
+        if gpd:
+            if gpd.use_stroke_edit_mode:
                 row = layout.row(align=True)
                 row.operator("gpencil.copy", text="", icon='COPYDOWN')
                 row.operator("gpencil.paste", text="", icon='PASTEDOWN')
@@ -159,12 +160,12 @@ class VIEW3D_HT_header(Header):
             if gpl:
                 layout.prop(gpl, "use_onion_skinning", text="Onion Skins", icon='PARTICLE_PATH')
 
-            if context.gpencil_data.use_stroke_edit_mode or context.gpencil_data.is_stroke_sculpt_mode:
+            if gpd.use_stroke_edit_mode or gpd.is_stroke_sculpt_mode:
                 row = layout.row(align=True)
                 row.prop(context.tool_settings.gpencil_sculpt, "use_select_mask")
                 row.prop(context.tool_settings.gpencil_sculpt, "selection_alpha", slider=True)
 
-                gpd = context.gpencil_data
+            if gpd.use_stroke_edit_mode or gpd.is_stroke_sculpt_mode or gpd.is_stroke_weight_mode:
                 row = layout.row(align=True)
                 row.prop(gpd, "multiedit", text="Multi Edit", icon="FORCE_HARMONIC")
                 row.prop(gpd, "multiedit_line_only", text="", icon="GHOST")
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index 9bd2ee23194..bc61d1b40d6 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -113,7 +113,7 @@ typedef struct tGPencilSort {
 #define GPENCIL_SKETCH_SESSIONS_ON(scene) ((scene)->toolsettings->gpencil_flags & GP_TOOL_FLAG_PAINTSESSIONS_ON)
 
 /* Check if 'multiedit sessions' is enabled */
-#define GPENCIL_MULTIEDIT_SESSIONS_ON(gpd) ((gpd) && (gpd->flag & (GP_DATA_STROKE_EDITMODE | GP_DATA_STROKE_SCULPTMODE)) && (gpd->flag & GP_DATA_STROKE_MULTIEDIT)) 
+#define GPENCIL_MULTIEDIT_SESSIONS_ON(gpd) ((gpd) && (gpd->flag & (GP_DATA_STROKE_EDITMODE | GP_DATA_STROKE_SCULPTMODE | GP_DATA_STROKE_WEIGHTMODE)) && (gpd->flag & GP_DATA_STROKE_MULTIEDIT)) 
 
 /* ----------- Grease Pencil Tools/Context ------------- */