[Bf-blender-cvs] [ea367d7cb1f] greasepencil-object: GPencil: Replace Mix Color by Vertex Color in UI

Antonio Vazquez noreply at git.blender.org
Sat Nov 2 20:30:40 CET 2019


Commit: ea367d7cb1ffd0ae0be9e9273df6093dad940f10
Author: Antonio Vazquez
Date:   Sat Nov 2 20:30:31 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBea367d7cb1ffd0ae0be9e9273df6093dad940f10

GPencil: Replace Mix Color by Vertex Color in UI

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

M	release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M	release/scripts/startup/bl_ui/space_view3d.py
M	release/scripts/startup/bl_ui/space_view3d_toolbar.py
M	source/blender/makesrna/intern/rna_brush.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 c271512d150..1e1989ae4d9 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -916,7 +916,7 @@ class GreasePencilMaterialsPanel:
                 if gpcolor.stroke_style == 'SOLID' or gpcolor.use_stroke_pattern:                
                     gp_settings = brush.gpencil_settings                    
                     row = layout.row()
-                    row.prop(gp_settings, "mix_color", text="Mix Color")
+                    row.prop(gp_settings, "mix_color", text="Vertex Color")
 
         else:
             space = context.space_data
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 82478491e99..c07b24b92e6 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -363,7 +363,7 @@ class _draw_tool_settings_context_mode:
 
         if context.object and brush.gpencil_tool == 'TINT':
             row.separator(factor=0.4)
-            row.label(text="Mix")
+            row.label(text="Vertex Color")
             row.prop(brush, "color", text="")
 
         from bl_ui.properties_paint_common import (
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 14f0e0f5606..6ab8d5eddbe 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -2032,7 +2032,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_random(View3DPanel, Panel):
 
 class VIEW3D_PT_tools_grease_pencil_brush_mixcolor(View3DPanel, Panel):
     bl_context = ".greasepencil_paint"
-    bl_label = "Mix Color"
+    bl_label = "Vertex Color"
     bl_category = "Tool"
 
     @classmethod
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c
index 5d49c1badff..cf1f1be4061 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -1299,7 +1299,7 @@ static void rna_def_gpencil_options(BlenderRNA *brna)
   RNA_def_property_range(prop, 0.0f, 1.0f);
   RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
   RNA_def_property_ui_text(
-      prop, "Mix Color", "Color used to mix with stroke color to get final color");
+      prop, "Vertex Color", "Color used to mix with stroke color to get final color");
 
   /* Flags */
   prop = RNA_def_property(srna, "use_pressure", PROP_BOOLEAN, PROP_NONE);



More information about the Bf-blender-cvs mailing list