[Bf-blender-cvs] [cddbe11beee] greasepencil-object: Minor RNA tweaks for MultiEdit

[Joshua Leung]

Commit: cddbe11beeeb2c8c6e2e2ad889671710a1ea198f
Author: Joshua Leung
Date:   Fri Oct 20 02:05:53 2017 +1300
Branches: greasepencil-object
https://developer.blender.org/rBcddbe11beeeb2c8c6e2e2ad889671710a1ea198f

Minor RNA tweaks for MultiEdit

* Rename RNA properties to bring them more in line with standard naming
* Make it clearer in the tooltip for MultiEdit that only selected keyframes
  will be edited

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

M	release/scripts/startup/bl_ui/properties_data_gpencil.py
M	release/scripts/startup/bl_ui/space_view3d.py
M	source/blender/makesrna/intern/rna_gpencil.c

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

diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py b/release/scripts/startup/bl_ui/properties_data_gpencil.py
index eafee115f51..7bd5f6704e6 100644
--- a/release/scripts/startup/bl_ui/properties_data_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py
@@ -146,7 +146,7 @@ class DATA_PT_gpencil_display(DataButtonsPanel, Panel):
         col = layout.column()
         col.prop(gpd, "show_edit_lines", text="Show Edit Lines")
         col.prop(gpd, "edit_line_color", text="")
-        col.prop(gpd, "multiedit_line_only", text="Only Lines in MultiEdit")
+        col.prop(gpd, "show_multiedit_line_only", text="Only Lines in MultiEdit")
 
 
 classes = (
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 5e7789d591e..280c6eba1bd 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -165,8 +165,8 @@ 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, "multiedit", text="Multi Edit", icon="FORCE_HARMONIC")
-                row.prop(gpd, "multiedit_line_only", text="", icon="GHOST")
+                row.prop(gpd, "use_multiedit", text="Multi Edit", icon="FORCE_HARMONIC")
+                row.prop(gpd, "show_multiedit_line_only", text="", icon="GHOST")
 
 
 class VIEW3D_MT_editor_menus(Menu):
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index 335dcf8d49d..7083ae4be1b 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -1475,12 +1475,12 @@ static void rna_def_gpencil_data(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "pixfactor", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "pixfactor");
 	RNA_def_property_range(prop, 30, 10000);
-	RNA_def_property_ui_text(prop, "Pixel Factor", "Factor of conversion of pixel size (set bigger values for thinner lines)");
+	RNA_def_property_ui_text(prop, "Pixel Factor", "Conversion factor for pixel size (use larger values for thinner lines)");
 	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
 
-	prop = RNA_def_property(srna, "multiedit", PROP_BOOLEAN, PROP_NONE);
+	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 in several grease pencil Keyframes at same time");
+	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_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
 
 	prop = RNA_def_property(srna, "show_edit_lines", PROP_BOOLEAN, PROP_NONE);
@@ -1496,7 +1496,7 @@ static void rna_def_gpencil_data(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Edit Line Color", "Color for editing line");
 	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
 
-	prop = RNA_def_property(srna, "multiedit_line_only", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "show_multiedit_line_only", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_DATA_STROKE_MULTIEDIT_LINES);
 	RNA_def_property_ui_text(prop, "Lines Only", "Show only edit lines for additional frames");
 	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");