[Bf-blender-cvs] [af79ac944d7] blender2.8: Cleanup: Replace "Move Color" to "Assign Material"

[Antonioya]

Commit: af79ac944d7b14f8ce24548345cac5a34ff4de55
Author: Antonioya
Date:   Wed Aug 1 10:39:16 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBaf79ac944d7b14f8ce24548345cac5a34ff4de55

Cleanup: Replace "Move Color" to "Assign Material"

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

M	release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M	release/scripts/startup/bl_ui/space_view3d.py
M	source/blender/editors/gpencil/gpencil_data.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 412071a642e..b291cc7bd82 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -204,7 +204,7 @@ class GreasePencilStrokeEditPanel:
         layout.separator()
         col = layout.column(align=True)
         col.operator_menu_enum("gpencil.stroke_arrange", text="Arrange Strokes...", property="direction")
-        col.operator("gpencil.stroke_change_color", text="Move to Color")
+        col.operator("gpencil.stroke_change_color", text="Assign Material")
 
         layout.separator()
         col = layout.column(align=True)
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 83bc10a78d9..ab01560351c 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3583,7 +3583,7 @@ class VIEW3D_MT_edit_gpencil(Menu):
         layout.separator()
 
         layout.operator_menu_enum("gpencil.move_to_layer", "layer", text="Move to Layer")
-        layout.operator("gpencil.stroke_change_color", text="Change Color")
+        layout.operator("gpencil.stroke_change_color", text="Assign Material")
         layout.operator_menu_enum("gpencil.stroke_arrange", "direction", text="Arrange Strokes...")
 
         layout.separator()
@@ -3633,7 +3633,7 @@ class VIEW3D_MT_sculpt_gpencil(Menu):
         layout.separator()
 
         layout.operator_menu_enum("gpencil.move_to_layer", "layer", text="Move to Layer")
-        layout.operator("gpencil.stroke_change_color", text="Change Color")
+        layout.operator("gpencil.stroke_change_color", text="Assign Material")
         layout.operator_menu_enum("gpencil.stroke_arrange", "direction", text="Arrange Strokes...")
 
         layout.separator()
diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c
index c58c45b3117..01cf8aeb7f1 100644
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@ -1192,7 +1192,7 @@ void GPENCIL_OT_stroke_change_color(wmOperatorType *ot)
 	/* identifiers */
 	ot->name = "Change Stroke Color";
 	ot->idname = "GPENCIL_OT_stroke_change_color";
-	ot->description = "Move selected strokes to active color";
+	ot->description = "Move selected strokes to active material";
 
 	/* callbacks */
 	ot->exec = gp_stroke_change_color_exec;