[Bf-blender-cvs] [ce0a5a435e1] temp-T96709-painting-target: Don't use override as variable name.

[Jeroen Bakker]

Commit: ce0a5a435e139fa8607b1fb8f21198e318c6fe7d
Author: Jeroen Bakker
Date:   Tue Apr 5 08:19:53 2022 +0200
Branches: temp-T96709-painting-target
https://developer.blender.org/rBce0a5a435e139fa8607b1fb8f21198e318c6fe7d

Don't use override as variable name.

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

M	source/blender/editors/sculpt_paint/paint_canvas.cc

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

diff --git a/source/blender/editors/sculpt_paint/paint_canvas.cc b/source/blender/editors/sculpt_paint/paint_canvas.cc
index 8d261bb23ad..85135aa6b4f 100644
--- a/source/blender/editors/sculpt_paint/paint_canvas.cc
+++ b/source/blender/editors/sculpt_paint/paint_canvas.cc
@@ -51,13 +51,13 @@ eV3DShadingColorType ED_paint_shading_color_override(bContext *C,
     return orig_color_type;
   }
 
-  eV3DShadingColorType override = orig_color_type;
+  eV3DShadingColorType color_type = orig_color_type;
   switch (settings->canvas_source) {
     case PAINT_CANVAS_SOURCE_COLOR_ATTRIBUTE:
-      override = V3D_SHADING_VERTEX_COLOR;
+      color_type = V3D_SHADING_VERTEX_COLOR;
       break;
     case PAINT_CANVAS_SOURCE_IMAGE:
-      override = V3D_SHADING_TEXTURE_COLOR;
+      color_type = V3D_SHADING_TEXTURE_COLOR;
       break;
     case PAINT_CANVAS_SOURCE_MATERIAL: {
       TexPaintSlot *slot = get_active_slot(ob);
@@ -66,10 +66,10 @@ eV3DShadingColorType ED_paint_shading_color_override(bContext *C,
       }
 
       if (slot->ima) {
-        override = V3D_SHADING_TEXTURE_COLOR;
+        color_type = V3D_SHADING_TEXTURE_COLOR;
       }
       if (slot->attribute_name) {
-        override = V3D_SHADING_VERTEX_COLOR;
+        color_type = V3D_SHADING_VERTEX_COLOR;
       }
 
       break;
@@ -77,14 +77,14 @@ eV3DShadingColorType ED_paint_shading_color_override(bContext *C,
   }
 
   /* Reset to original color based on enabled experimental features */
-  if (!U.experimental.use_sculpt_vertex_colors && override == V3D_SHADING_VERTEX_COLOR) {
+  if (!U.experimental.use_sculpt_vertex_colors && color_type == V3D_SHADING_VERTEX_COLOR) {
     return orig_color_type;
   }
-  if (!U.experimental.use_sculpt_texture_paint && override == V3D_SHADING_TEXTURE_COLOR) {
+  if (!U.experimental.use_sculpt_texture_paint && color_type == V3D_SHADING_TEXTURE_COLOR) {
     return orig_color_type;
   }
 
-  return override;
+  return color_type;
 }
 
 Image *ED_paint_canvas_image_get(const struct PaintModeSettings *settings, struct Object *ob)