1 files changed, 3 insertions, 68 deletions

diff --git a/source/blender/editors/sculpt_paint/paint_canvas.cc b/source/blender/editors/sculpt_paint/paint_canvas.cc
index 5683e3ff741..9262cbebcac 100644
--- a/source/blender/editors/sculpt_paint/paint_canvas.cc
+++ b/source/blender/editors/sculpt_paint/paint_canvas.cc
@@ -2,20 +2,11 @@
 #include "BLI_compiler_compat.h"
 
 #include "DNA_material_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_node_types.h"
-#include "DNA_screen_types.h"
+#include "DNA_scene_types.h"
 #include "DNA_workspace_types.h"
 
-#include "BKE_context.h"
-#include "BKE_customdata.h"
 #include "BKE_material.h"
 #include "BKE_paint.h"
-#include "BKE_pbvh.h"
-
-#include "DEG_depsgraph.h"
-
-#include "NOD_shader.h"
 
 #include "WM_toolsystem.h"
 
@@ -43,16 +34,15 @@ static TexPaintSlot *get_active_slot(Object *ob)
 
 extern "C" {
 
-using namespace blender;
 using namespace blender::ed::sculpt_paint::canvas;
 
 /* Does the paint tool with the given idname uses a canvas. */
-static bool paint_tool_uses_canvas(StringRef idname)
+static bool paint_tool_uses_canvas(blender::StringRef idname)
 {
   return ELEM(idname, "builtin_brush.Paint", "builtin_brush.Smear", "builtin.color_filter");
 }
 
-static bool paint_tool_shading_color_follows_last_used(StringRef idname)
+static bool paint_tool_shading_color_follows_last_used(blender::StringRef idname)
 {
   /* TODO(jbakker): complete this list. */
   return ELEM(idname, "builtin_brush.Mask");
@@ -147,59 +137,4 @@ eV3DShadingColorType ED_paint_shading_color_override(bContext *C,
 
   return color_type;
 }
-
-Image *ED_paint_canvas_image_get(const struct PaintModeSettings *settings, struct Object *ob)
-{
-  switch (settings->canvas_source) {
-    case PAINT_CANVAS_SOURCE_COLOR_ATTRIBUTE:
-      return nullptr;
-    case PAINT_CANVAS_SOURCE_IMAGE:
-      return settings->canvas_image;
-    case PAINT_CANVAS_SOURCE_MATERIAL: {
-      TexPaintSlot *slot = get_active_slot(ob);
-      if (slot == nullptr) {
-        break;
-      }
-      return slot->ima;
-    }
-  }
-  return nullptr;
-}
-
-int ED_paint_canvas_uvmap_layer_index_get(const struct PaintModeSettings *settings,
-                                          struct Object *ob)
-{
-  switch (settings->canvas_source) {
-    case PAINT_CANVAS_SOURCE_COLOR_ATTRIBUTE:
-      return -1;
-    case PAINT_CANVAS_SOURCE_IMAGE: {
-      /* Use active uv map of the object. */
-      if (ob->type != OB_MESH) {
-        return -1;
-      }
-
-      const Mesh *mesh = static_cast<Mesh *>(ob->data);
-      return CustomData_get_active_layer_index(&mesh->ldata, CD_MLOOPUV);
-    }
-    case PAINT_CANVAS_SOURCE_MATERIAL: {
-      /* Use uv map of the canvas. */
-      TexPaintSlot *slot = get_active_slot(ob);
-      if (slot == nullptr) {
-        break;
-      }
-
-      if (ob->type != OB_MESH) {
-        return -1;
-      }
-
-      if (slot->uvname == nullptr) {
-        return -1;
-      }
-
-      const Mesh *mesh = static_cast<Mesh *>(ob->data);
-      return CustomData_get_named_layer_index(&mesh->ldata, CD_MLOOPUV, slot->uvname);
-    }
-  }
-  return -1;
-}
 }