[Bf-blender-cvs] [f49c833] GPencil_Editing_Stage3: Code Cleanup: Removed the need to set the "gpencil_strokes" property on transform ops when editing GP Strokes
Joshua Leung
noreply at git.blender.org
Fri Oct 23 05:57:55 CEST 2015
Commit: f49c833d00c344fa56e78a6095ae599da679f822
Author: Joshua Leung
Date: Fri Oct 23 16:02:35 2015 +1300
Branches: GPencil_Editing_Stage3
https://developer.blender.org/rBf49c833d00c344fa56e78a6095ae599da679f822
Code Cleanup: Removed the need to set the "gpencil_strokes" property on transform ops when editing GP Strokes
Now that we've got a dedicated mode for this, we can now safely check this from
the context settings and set the relevant flags internally instead.
===================================================================
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
M source/blender/editors/transform/transform_conversions.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 973fab5..3c2f2c6 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -138,21 +138,21 @@ class GreasePencilStrokeEditPanel:
col = layout.column(align=True)
col.operator("gpencil.delete", text="Delete")
col.operator("gpencil.duplicate_move", text="Duplicate")
- col.operator("transform.mirror", text="Mirror").gpencil_strokes = True
+ col.operator("transform.mirror", text="Mirror")
layout.separator()
col = layout.column(align=True)
- col.operator("transform.translate").gpencil_strokes = True # icon='MAN_TRANS'
- col.operator("transform.rotate").gpencil_strokes = True # icon='MAN_ROT'
- col.operator("transform.resize", text="Scale").gpencil_strokes = True # icon='MAN_SCALE'
+ col.operator("transform.translate") # icon='MAN_TRANS'
+ col.operator("transform.rotate") # icon='MAN_ROT'
+ col.operator("transform.resize", text="Scale") # icon='MAN_SCALE'
layout.separator()
col = layout.column(align=True)
- col.operator("transform.bend", text="Bend").gpencil_strokes = True
- col.operator("transform.shear", text="Shear").gpencil_strokes = True
- col.operator("transform.tosphere", text="To Sphere").gpencil_strokes = True
+ col.operator("transform.bend", text="Bend")
+ col.operator("transform.shear", text="Shear")
+ col.operator("transform.tosphere", text="To Sphere")
class GreasePencilStrokeSculptPanel:
@@ -231,9 +231,9 @@ class GPENCIL_PIE_tool_palette(Menu):
# N - Transforms
col = pie.column()
row = col.row(align=True)
- row.operator("transform.translate", icon='MAN_TRANS').gpencil_strokes = True
- row.operator("transform.rotate", icon='MAN_ROT').gpencil_strokes = True
- row.operator("transform.resize", text="Scale", icon='MAN_SCALE').gpencil_strokes = True
+ row.operator("transform.translate", icon='MAN_TRANS')
+ row.operator("transform.rotate", icon='MAN_ROT')
+ row.operator("transform.resize", text="Scale", icon='MAN_SCALE')
row = col.row(align=True)
row.label("Proportional Edit:")
row.prop(context.tool_settings, "proportional_edit", text="", icon_only=True)
@@ -334,10 +334,10 @@ class GPENCIL_PIE_tools_more(Menu):
col.operator("gpencil.select_more", icon='ZOOMIN')
col.operator("gpencil.select_less", icon='ZOOMOUT')
- pie.operator("transform.mirror", icon='MOD_MIRROR').gpencil_strokes = True
- pie.operator("transform.bend", icon='MOD_SIMPLEDEFORM').gpencil_strokes = True
- pie.operator("transform.shear", icon='MOD_TRIANGULATE').gpencil_strokes = True
- pie.operator("transform.tosphere", icon='MOD_MULTIRES').gpencil_strokes = True
+ pie.operator("transform.mirror", icon='MOD_MIRROR')
+ pie.operator("transform.bend", icon='MOD_SIMPLEDEFORM')
+ pie.operator("transform.shear", icon='MOD_TRIANGULATE')
+ pie.operator("transform.tosphere", icon='MOD_MULTIRES')
pie.operator("gpencil.convert", icon='OUTLINER_OB_CURVE', text="Convert...")
pie.operator("wm.call_menu_pie", text="Back to Main Palette...").name = "GPENCIL_PIE_tool_palette"
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 9a6915f..da1bcfc 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2888,7 +2888,7 @@ class VIEW3D_MT_edit_gpencil(Menu):
layout.menu("VIEW3D_MT_edit_gpencil_delete")
layout.operator("gpencil.duplicate_move", text="Duplicate")
- layout.operator("transform.mirror", text="Mirror").gpencil_strokes = True
+ layout.operator("transform.mirror", text="Mirror")
layout.separator()
@@ -2918,19 +2918,16 @@ class VIEW3D_MT_edit_gpencil_transform(Menu):
def draw(self, context):
layout = self.layout
- layout.operator("transform.translate").gpencil_strokes = True
- layout.operator("transform.rotate").gpencil_strokes = True
- layout.operator("transform.resize", text="Scale").gpencil_strokes = True
+ layout.operator("transform.translate")
+ layout.operator("transform.rotate")
+ layout.operator("transform.resize", text="Scale")
layout.separator()
- layout.operator("transform.bend", text="Bend").gpencil_strokes = True
- layout.operator("transform.shear", text="Shear").gpencil_strokes = True
- layout.operator("transform.tosphere", text="To Sphere").gpencil_strokes = True
-
- props = layout.operator("transform.transform", text="Shrink Fatten")
- props.mode = 'GPENCIL_SHRINKFATTEN'
- props.gpencil_strokes = True
+ layout.operator("transform.bend", text="Bend")
+ layout.operator("transform.shear", text="Shear")
+ layout.operator("transform.tosphere", text="To Sphere")
+ layout.operator("transform.transform", text="Shrink Fatten").mode = 'GPENCIL_SHRINKFATTEN'
# ********** Panel **********
diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index 933bcdf..bcb233c 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -247,32 +247,23 @@ static void ed_keymap_gpencil_editing(wmKeyConfig *keyconf)
/* Transform Tools */
kmi = WM_keymap_add_item(keymap, "TRANSFORM_OT_translate", GKEY, KM_PRESS, 0, 0);
- RNA_boolean_set(kmi->ptr, "gpencil_strokes", true);
kmi = WM_keymap_add_item(keymap, "TRANSFORM_OT_translate", EVT_TWEAK_S, KM_ANY, 0, 0);
- RNA_boolean_set(kmi->ptr, "gpencil_strokes", true);
kmi = WM_keymap_add_item(keymap, "TRANSFORM_OT_rotate", RKEY, KM_PRESS, 0, 0);
- RNA_boolean_set(kmi->ptr, "gpencil_strokes", true);
kmi = WM_keymap_add_item(keymap, "TRANSFORM_OT_resize", SKEY, KM_PRESS, 0, 0);
- RNA_boolean_set(kmi->ptr, "gpencil_strokes", true);
kmi = WM_keymap_add_item(keymap, "TRANSFORM_OT_mirror", MKEY, KM_PRESS, KM_CTRL, 0);
- RNA_boolean_set(kmi->ptr, "gpencil_strokes", true);
kmi = WM_keymap_add_item(keymap, "TRANSFORM_OT_bend", WKEY, KM_PRESS, KM_SHIFT, 0);
- RNA_boolean_set(kmi->ptr, "gpencil_strokes", true);
WM_keymap_add_item(keymap, "TRANSFORM_OT_tosphere", SKEY, KM_PRESS, KM_ALT | KM_SHIFT, 0);
- RNA_boolean_set(kmi->ptr, "gpencil_strokes", true);
WM_keymap_add_item(keymap, "TRANSFORM_OT_shear", SKEY, KM_PRESS, KM_ALT | KM_CTRL | KM_SHIFT, 0);
- RNA_boolean_set(kmi->ptr, "gpencil_strokes", true);
kmi = WM_keymap_add_item(keymap, "TRANSFORM_OT_transform", SKEY, KM_PRESS, KM_ALT, 0);
RNA_enum_set(kmi->ptr, "mode", TFM_GPENCIL_SHRINKFATTEN);
- RNA_boolean_set(kmi->ptr, "gpencil_strokes", true);
/* Proportional Editing */
ED_keymap_proportional_cycle(keyconf, keymap);
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 3dc1485..f14ce67 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -7885,6 +7885,7 @@ void createTransData(bContext *C, TransInfo *t)
{
Scene *scene = t->scene;
Object *ob = OBACT;
+ bGPdata *gpd = CTX_data_gpencil_data(C);
/* if tests must match recalcData for correct updates */
if (t->options & CTX_TEXTURE) {
@@ -7901,8 +7902,9 @@ void createTransData(bContext *C, TransInfo *t)
sort_trans_data_dist(t);
}
}
- else if (t->options & CTX_GPENCIL_STROKES) {
- t->flag |= T_POINTS; // XXX...
+ else if ((t->options & CTX_GPENCIL_STROKES) || ((gpd) && (gpd->flag & GP_DATA_STROKE_EDITMODE))) {
+ t->options |= CTX_GPENCIL_STROKES;
+ t->flag |= T_POINTS;
createTransGPencil(C, t);
if (t->data && (t->flag & T_PROP_EDIT)) {
More information about the Bf-blender-cvs
mailing list