[Bf-blender-cvs] [1731c93ed0c] greasepencil-object: GPencil: Rename material Boxes Stroke to Squares Stroke

Antonio Vazquez noreply at git.blender.org
Mon Mar 2 16:20:29 CET 2020


Commit: 1731c93ed0c541f64c08101909b51c04b3e323c6
Author: Antonio Vazquez
Date:   Mon Mar 2 16:16:18 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB1731c93ed0c541f64c08101909b51c04b3e323c6

GPencil: Rename material Boxes Stroke to Squares Stroke

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

M	source/blender/blenloader/intern/versioning_defaults.c
M	source/blender/editors/gpencil/gpencil_vertex_ops.c

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

diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index 62b53a1c491..dd0afcfa967 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -630,7 +630,7 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template)
     /* Rename and fix materials. */
     Material *ma = NULL;
     rename_id_for_versioning(bmain, ID_MA, "Black", "Solid Stroke");
-    rename_id_for_versioning(bmain, ID_MA, "Red", "Boxes Stroke");
+    rename_id_for_versioning(bmain, ID_MA, "Red", "Squares Stroke");
     rename_id_for_versioning(bmain, ID_MA, "Grey", "Solid Fill");
     rename_id_for_versioning(bmain, ID_MA, "Black Dots", "Dots Stroke");
 
@@ -641,10 +641,10 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template)
     }
     ma->gp_style->mode = GP_MATERIAL_MODE_DOT;
 
-    /* Boxes Stroke. */
-    ma = BLI_findstring(&bmain->materials, "Boxes Stroke", offsetof(ID, name) + 2);
+    /* Squars Stroke. */
+    ma = BLI_findstring(&bmain->materials, "Squares Stroke", offsetof(ID, name) + 2);
     if (ma == NULL) {
-      ma = BKE_gpencil_material_add(bmain, "Boxes Stroke");
+      ma = BKE_gpencil_material_add(bmain, "Squares Stroke");
     }
     ma->gp_style->mode = GP_MATERIAL_MODE_SQUARE;
 
diff --git a/source/blender/editors/gpencil/gpencil_vertex_ops.c b/source/blender/editors/gpencil/gpencil_vertex_ops.c
index b77df4cef21..5737c97a4b4 100644
--- a/source/blender/editors/gpencil/gpencil_vertex_ops.c
+++ b/source/blender/editors/gpencil/gpencil_vertex_ops.c
@@ -612,7 +612,7 @@ static uint get_material_type(MaterialGPencilStyle *gp_style,
       }
       case GP_MATERIAL_MODE_SQUARE: {
         r_i = 3;
-        strcpy(name, "Boxes Stroke-Fill");
+        strcpy(name, "Squares Stroke-Fill");
         break;
       }
       default:
@@ -633,7 +633,7 @@ static uint get_material_type(MaterialGPencilStyle *gp_style,
       }
       case GP_MATERIAL_MODE_SQUARE: {
         r_i = 6;
-        strcpy(name, "Boxes Stroke");
+        strcpy(name, "Squares Stroke");
         break;
       }
       default:



More information about the Bf-blender-cvs mailing list