[Bf-blender-cvs] [a666a5d0164] greasepencil-object: UI: Rename MultiEdit to MultiFrame

Antonio Vazquez noreply at git.blender.org
Mon Nov 20 19:13:00 CET 2017


Commit: a666a5d0164313e0743af129a645511f04bb1b17
Author: Antonio Vazquez
Date:   Mon Nov 20 19:12:52 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rBa666a5d0164313e0743af129a645511f04bb1b17

UI: Rename MultiEdit to MultiFrame

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

M	release/scripts/startup/bl_ui/space_view3d.py
M	source/blender/editors/gpencil/gpencil_edit.c
M	source/blender/makesrna/intern/rna_gpencil.c

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 495a14f2096..be52f449d64 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -164,7 +164,7 @@ class VIEW3D_HT_header(Header):
 
             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, "use_multiedit", text="Multi Edit", icon="FORCE_HARMONIC")
+                row.prop(gpd, "use_multiedit", text="Multi Frame", icon="FORCE_HARMONIC")
                 row.prop(gpd, "show_multiedit_line_only", text="", icon="GHOST")
 
 
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index e6165ee1726..7e41b839602 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -552,9 +552,9 @@ static int gpencil_multiedit_toggle_exec(bContext *C, wmOperator *op)
 void GPENCIL_OT_multiedit_toggle(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name = "MultiEdit Toggle";
+	ot->name = "Multiframe Edit Toggle";
 	ot->idname = "GPENCIL_OT_multiedit_toggle";
-	ot->description = "Enable/Disable multiedit strokes support";
+	ot->description = "Enable/Disable multiframe edit strokes support";
 
 	/* callbacks */
 	ot->exec = gpencil_multiedit_toggle_exec;
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index 24fc96e49b6..aa9fd6a8429 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -1482,7 +1482,7 @@ static void rna_def_gpencil_data(BlenderRNA *brna)
 
 	prop = RNA_def_property(srna, "use_multiedit", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_DATA_STROKE_MULTIEDIT);
-	RNA_def_property_ui_text(prop, "MultiEdit", "Edit strokes from multiple grease pencil keyframes at the same time (keyframes must be selected to be included)");
+	RNA_def_property_ui_text(prop, "MultiFrame", "Edit strokes from multiple grease pencil keyframes at the same time (keyframes must be selected to be included)");
 	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
 
 	prop = RNA_def_property(srna, "show_edit_lines", PROP_BOOLEAN, PROP_NONE);



More information about the Bf-blender-cvs mailing list