Commit: 0be82251b358d9f72ae18f8983563888068b8038
Author: Joshua Leung
Date: Wed Nov 5 19:36:51 2014 +1300
Branches: GPencil_EditStrokes
https://developer.blender.org/rB0be82251b358d9f72ae18f8983563888068b8038
Rename GPENCIL_OT_strokes_copy to GPENCIL_OT_duplicate
This is to make room for copy/paste operators (using a copy/paste buffer)
===================================================================
M release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M source/blender/editors/gpencil/gpencil_edit.c
M source/blender/editors/gpencil/gpencil_intern.h
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 7faa9d9..5fafa8f 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -119,7 +119,7 @@ class GreasePencilStrokeEditPanel():
subcol = col.column(align=True)
subcol.active = edit_ok
subcol.operator("gpencil.delete", text="Delete")
- subcol.operator("gpencil.strokes_duplicate", text="Duplicate")
+ subcol.operator("gpencil.duplicate_move", text="Duplicate")
subcol.operator("transform.mirror", text="Mirror").gpencil_strokes =
True
col.separator()
diff --git a/source/blender/editors/gpencil/gpencil_edit.c
b/source/blender/editors/gpencil/gpencil_edit.c
index ba37ee8..d53fda0 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -491,7 +491,7 @@ void GPENCIL_OT_layer_move(wmOperatorType *ot)
/* ******************* Copy Selected Strokes *********************** */
-static int gp_strokes_copy_poll(bContext *C)
+static int gp_duplicate_poll(bContext *C)
{
bGPdata *gpd = ED_gpencil_data_get_active(C);
bGPDlayer *gpl = gpencil_layer_getactive(gpd);
@@ -502,7 +502,7 @@ static int gp_strokes_copy_poll(bContext *C)
}
/* Make copies of selected point segments in a selected stroke */
-static void gp_strokes_copy_points(const bGPDstroke *gps, ListBase
*new_strokes)
+static void gp_duplicate_points(const bGPDstroke *gps, ListBase *new_strokes)
{
bGPDspoint *pt;
int i;
@@ -560,7 +560,7 @@ static void gp_strokes_copy_points(const bGPDstroke *gps,
ListBase *new_strokes)
}
}
-static int gp_strokes_copy_exec(bContext *C, wmOperator *op)
+static int gp_duplicate_exec(bContext *C, wmOperator *op)
{
bGPdata *gpd = ED_gpencil_data_get_active(C);
bGPDlayer *gpl;
@@ -599,7 +599,7 @@ static int gp_strokes_copy_exec(bContext *C, wmOperator *op)
}
else {
/* delegate to a helper, as
there's too much to fit in here (for copying subsets)... */
- gp_strokes_copy_points(gps,
&new_strokes);
+ gp_duplicate_points(gps,
&new_strokes);
}
/* deselect original stroke, or else
the originals get moved too
@@ -621,16 +621,16 @@ static int gp_strokes_copy_exec(bContext *C, wmOperator
*op)
return OPERATOR_FINISHED;
}
-void GPENCIL_OT_strokes_copy(wmOperatorType *ot)
+void GPENCIL_OT_duplicate(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Copy Strokes";
- ot->idname = "GPENCIL_OT_strokes_copy";
+ ot->idname = "GPENCIL_OT_duplicate";
ot->description = "Duplicate the selected Grease Pencil strokes";
/* callbacks */
- ot->exec = gp_strokes_copy_exec;
- ot->poll = gp_strokes_copy_poll;
+ ot->exec = gp_duplicate_exec;
+ ot->poll = gp_duplicate_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
diff --git a/source/blender/editors/gpencil/gpencil_intern.h
b/source/blender/editors/gpencil/gpencil_intern.h
index ac1252b..7e087d0 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -118,7 +118,7 @@ void GPENCIL_OT_select_all(struct wmOperatorType *ot);
void GPENCIL_OT_select_circle(struct wmOperatorType *ot);
void GPENCIL_OT_select_border(struct wmOperatorType *ot);
-void GPENCIL_OT_strokes_copy(struct wmOperatorType *ot);
+void GPENCIL_OT_duplicate(struct wmOperatorType *ot);
void GPENCIL_OT_delete(struct wmOperatorType *ot);
/* buttons editing --- */
diff --git a/source/blender/editors/gpencil/gpencil_ops.c
b/source/blender/editors/gpencil/gpencil_ops.c
index 30d9652..62383f9 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -137,7 +137,7 @@ static void ed_keymap_gpencil_editing(wmKeyConfig *keyconf)
/* Editing ----------------------------------------- */
/* duplicate and move selected points */
- WM_keymap_add_item(keymap, "GPENCIL_OT_strokes_duplicate", DKEY,
KM_PRESS, KM_SHIFT, 0);
+ WM_keymap_add_item(keymap, "GPENCIL_OT_duplicate_move", DKEY, KM_PRESS,
KM_SHIFT, 0);
/* delete */
WM_keymap_add_item(keymap, "GPENCIL_OT_delete", XKEY, KM_PRESS, 0, 0);
@@ -189,7 +189,7 @@ void ED_operatortypes_gpencil(void)
WM_operatortype_append(GPENCIL_OT_select_circle);
WM_operatortype_append(GPENCIL_OT_select_border);
- WM_operatortype_append(GPENCIL_OT_strokes_copy);
+ WM_operatortype_append(GPENCIL_OT_duplicate);
WM_operatortype_append(GPENCIL_OT_delete);
/* Editing (Buttons) ------------ */
@@ -213,10 +213,10 @@ void ED_operatormacros_gpencil(void)
wmOperatorType *ot;
wmOperatorTypeMacro *otmacro;
- ot = WM_operatortype_append_macro("GPENCIL_OT_strokes_duplicate",
"Duplicate Strokes",
+ ot = WM_operatortype_append_macro("GPENCIL_OT_duplicate_move",
"Duplicate Strokes",
"Make copies of the selected Grease
Pencil strokes and move them",
OPTYPE_UNDO | OPTYPE_REGISTER);
- WM_operatortype_macro_define(ot, "GPENCIL_OT_strokes_copy");
+ WM_operatortype_macro_define(ot, "GPENCIL_OT_duplicate");
otmacro = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
RNA_enum_set(otmacro->ptr, "gpencil_strokes", true);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
