[Bf-blender-cvs] [f4792e6801c] temp-T96709-painting-target: Rename to ED_paint_shading_color_override.

[Jeroen Bakker]

Commit: f4792e6801cf2b36506835db60378dc9f2e42d20
Author: Jeroen Bakker
Date:   Wed Mar 30 08:12:54 2022 +0200
Branches: temp-T96709-painting-target
https://developer.blender.org/rBf4792e6801cf2b36506835db60378dc9f2e42d20

Rename to ED_paint_shading_color_override.

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

M	source/blender/draw/engines/workbench/workbench_engine.c
M	source/blender/editors/include/ED_paint.h
M	source/blender/editors/sculpt_paint/paint_canvas.cc

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

diff --git a/source/blender/draw/engines/workbench/workbench_engine.c b/source/blender/draw/engines/workbench/workbench_engine.c
index 6e5ee9bfe35..50bb05f6d52 100644
--- a/source/blender/draw/engines/workbench/workbench_engine.c
+++ b/source/blender/draw/engines/workbench/workbench_engine.c
@@ -322,7 +322,7 @@ static eV3DShadingColorType workbench_color_type_get(WORKBENCH_PrivateData *wpd,
      * due to current API. */
     bContext *C = (bContext *)DRW_context_state_get()->evil_C;
     if (C != NULL) {
-      color_type = ED_paint_draw_color_override(
+      color_type = ED_paint_shading_color_override(
           C, &wpd->scene->toolsettings->paint_mode, ob, color_type);
     }
   }
diff --git a/source/blender/editors/include/ED_paint.h b/source/blender/editors/include/ED_paint.h
index 2457489d81c..bb92e5c3810 100644
--- a/source/blender/editors/include/ED_paint.h
+++ b/source/blender/editors/include/ED_paint.h
@@ -120,10 +120,10 @@ int ED_paint_canvas_uvmap_layer_index_get(const struct PaintModeSettings *settin
                                           struct Object *ob);
 
 /** Color type of an object can be overridden in sculpt/paint mode. */
-eV3DShadingColorType ED_paint_draw_color_override(struct bContext *C,
-                                                  const struct PaintModeSettings *settings,
-                                                  struct Object *ob,
-                                                  eV3DShadingColorType orig_color_type);
+eV3DShadingColorType ED_paint_shading_color_override(struct bContext *C,
+                                                     const struct PaintModeSettings *settings,
+                                                     struct Object *ob,
+                                                     eV3DShadingColorType orig_color_type);
 
 /** Does the active tool uses a paint canvas for the given object. */
 bool ED_paint_tool_use_canvas(struct bContext *C, struct Object *ob);
diff --git a/source/blender/editors/sculpt_paint/paint_canvas.cc b/source/blender/editors/sculpt_paint/paint_canvas.cc
index a82e7450aa6..8d261bb23ad 100644
--- a/source/blender/editors/sculpt_paint/paint_canvas.cc
+++ b/source/blender/editors/sculpt_paint/paint_canvas.cc
@@ -42,10 +42,10 @@ extern "C" {
 using namespace blender;
 using namespace blender::ed::sculpt_paint::canvas;
 
-eV3DShadingColorType ED_paint_draw_color_override(bContext *C,
-                                                  const PaintModeSettings *settings,
-                                                  Object *ob,
-                                                  eV3DShadingColorType orig_color_type)
+eV3DShadingColorType ED_paint_shading_color_override(bContext *C,
+                                                     const PaintModeSettings *settings,
+                                                     Object *ob,
+                                                     eV3DShadingColorType orig_color_type)
 {
   if (!ED_paint_tool_use_canvas(C, ob)) {
     return orig_color_type;