[Bf-blender-cvs] [b7035cb8bd9] blender2.8: GP: Change canvas titles

Antonioya noreply at git.blender.org
Fri Sep 21 14:10:43 CEST 2018


Commit: b7035cb8bd93d244b505264655310ef59ba0965b
Author: Antonioya
Date:   Fri Sep 21 14:10:24 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBb7035cb8bd93d244b505264655310ef59ba0965b

GP: Change canvas titles

These changes are to harmonize names.

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

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

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 1b7687a22c1..8f6f3f7f4bf 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -4852,7 +4852,7 @@ class VIEW3D_PT_overlay_gpencil_options(Panel):
             row.prop(overlay, "gpencil_grid_scale")
             col = row.column()
             col.prop(overlay, "gpencil_grid_lines", text="Subdivisions")
-            col.prop(overlay, "gpencil_grid_axis")
+            col.prop(overlay, "gpencil_grid_axis", text="Plane")
 
         if context.object.mode in {'GPENCIL_EDIT', 'GPENCIL_SCULPT', 'GPENCIL_WEIGHT'}:
             layout.prop(overlay, "use_gpencil_edit_lines", text="Edit Lines")
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index db886692814..c757f648f4d 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -310,10 +310,10 @@ const EnumPropertyItem rna_enum_file_sort_items[] = {
 };
 
 static const EnumPropertyItem rna_enum_gpencil_grid_axis_items[] = {
-	{V3D_GP_GRID_AXIS_LOCK, "LOCK", 0, "Lock", "Use current drawing locked axis" },
-	{V3D_GP_GRID_AXIS_X, "X", 0, "X", ""},
-	{V3D_GP_GRID_AXIS_Y, "Y", 0, "Y", ""},
-	{V3D_GP_GRID_AXIS_Z, "Z", 0, "Z", ""},
+	{V3D_GP_GRID_AXIS_LOCK, "LOCK", 0, "Drawing Plane", "Use current drawing locked axis" },
+	{V3D_GP_GRID_AXIS_X, "X", 0, "Y-Z", ""},
+	{V3D_GP_GRID_AXIS_Y, "Y", 0, "X-Z", ""},
+	{V3D_GP_GRID_AXIS_Z, "Z", 0, "X-Y", ""},
 	{0, NULL, 0, NULL, NULL}
 };
 
@@ -2865,7 +2865,7 @@ static void rna_def_space_view3d_overlay(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "gpencil_grid_axis", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "overlay.gpencil_grid_axis");
 	RNA_def_property_enum_items(prop, rna_enum_gpencil_grid_axis_items);
-	RNA_def_property_ui_text(prop, "Axis", "Axis to display grid");
+	RNA_def_property_ui_text(prop, "Canvas Plane", "Axis to display grid");
 	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
 
 	prop = RNA_def_property(srna, "gpencil_grid_opacity", PROP_FLOAT, PROP_NONE);



More information about the Bf-blender-cvs mailing list