[Bf-blender-cvs] [69ead4b848d] temp-T96709-painting-target: Renamed enum values (added SOURCE_).

[Jeroen Bakker]

Commit: 69ead4b848d4170ae0722121a507a513f6fa6dbf
Author: Jeroen Bakker
Date:   Mon Mar 28 12:12:58 2022 +0200
Branches: temp-T96709-painting-target
https://developer.blender.org/rB69ead4b848d4170ae0722121a507a513f6fa6dbf

Renamed enum values (added SOURCE_).

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

M	source/blender/editors/sculpt_paint/paint_canvas_material.cc
M	source/blender/makesdna/DNA_scene_types.h
M	source/blender/makesrna/intern/rna_sculpt_paint.c

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

diff --git a/source/blender/editors/sculpt_paint/paint_canvas_material.cc b/source/blender/editors/sculpt_paint/paint_canvas_material.cc
index f0428dbf7e3..da2cbd7b8cc 100644
--- a/source/blender/editors/sculpt_paint/paint_canvas_material.cc
+++ b/source/blender/editors/sculpt_paint/paint_canvas_material.cc
@@ -27,19 +27,19 @@
 namespace blender::ed::sculpt_paint::canvas {
 
 /**
- * @brief Store a material slot and resource index encoded as an int.
+ * @brief Store a material slot and index encoded as an int.
  */
-struct MaterialResourceIndex {
+struct MaterialCanvasIndex {
  private:
   int32_t encoded_;
 
  public:
-  MaterialResourceIndex(int32_t encoded) : encoded_(encoded)
+  MaterialCanvasIndex(int32_t encoded) : encoded_(encoded)
   {
   }
 
-  MaterialResourceIndex(uint16_t material_slot, uint16_t resource_index)
-      : encoded_(MaterialResourceIndex::encode(material_slot, resource_index))
+  MaterialCanvasIndex(uint16_t material_slot, uint16_t resource_index)
+      : encoded_(MaterialCanvasIndex::encode(material_slot, resource_index))
   {
   }
 
@@ -85,20 +85,20 @@ struct MaterialResourceIndex {
 };
 
 struct MaterialCanvas {
-  MaterialResourceIndex material_resource;
+  MaterialCanvasIndex index;
 
   bNode *node;
   EnumPropertyItem rna_enum_item;
 
   MaterialCanvas(uint16_t material_slot, uint16_t resource_index, bNode *node)
-      : material_resource(material_slot, resource_index), node(node)
+      : index(material_slot, resource_index), node(node)
   {
     init_rna_enum_item();
   }
 
   uint16_t resource_index() const
   {
-    return material_resource.resource_index();
+    return index.resource_index();
   }
 
  private:
@@ -123,7 +123,7 @@ struct MaterialCanvas {
   void init_rna_enum_item_image(Image *image)
   {
     BLI_assert(image != nullptr);
-    rna_enum_item.value = material_resource.encoded();
+    rna_enum_item.value = index.encoded();
     rna_enum_item.identifier = image->id.name + 2;
     rna_enum_item.icon = ICON_IMAGE;
     rna_enum_item.name = image->id.name + 2;
@@ -132,7 +132,7 @@ struct MaterialCanvas {
 
   void init_rna_enum_item_color_attribute(const NodeShaderAttribute *attribute)
   {
-    rna_enum_item.value = material_resource.encoded();
+    rna_enum_item.value = index.encoded();
     rna_enum_item.identifier = attribute->name;
     rna_enum_item.icon = ICON_COLOR;
     rna_enum_item.name = attribute->name;
@@ -384,7 +384,7 @@ int ED_paint_canvas_material_get(Object *ob)
 
 void ED_paint_canvas_material_set(Object *ob, int new_value)
 {
-  const MaterialResourceIndex material_resource(new_value);
+  const MaterialCanvasIndex material_resource(new_value);
 
   std::optional<MaterialWrapper> material = get_material_in_slot(
       ob, material_resource.material_slot());
@@ -421,13 +421,13 @@ eV3DShadingColorType ED_paint_draw_color_override(const PaintModeSettings *setti
 
   eV3DShadingColorType override = orig_color_type;
   switch (settings->canvas_source) {
-    case PAINT_CANVAS_COLOR_ATTRIBUTE:
+    case PAINT_CANVAS_SOURCE_COLOR_ATTRIBUTE:
       override = V3D_SHADING_VERTEX_COLOR;
       break;
-    case PAINT_CANVAS_IMAGE:
+    case PAINT_CANVAS_SOURCE_IMAGE:
       override = V3D_SHADING_TEXTURE_COLOR;
       break;
-    case PAINT_CANVAS_MATERIAL: {
+    case PAINT_CANVAS_SOURCE_MATERIAL: {
       std::optional<MaterialWrapper> material = get_active_material(ob);
       if (!material.has_value()) {
         break;
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 936d9d6a203..106ebaa80bb 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -930,7 +930,7 @@ typedef struct PaintModeSettings {
   char canvas_source;
   char _pad[7];
 
-  /** Selected image when canvas_source=PAINT_CANVAS_IMAGE. */
+  /** Selected image when canvas_source=PAINT_CANVAS_SOURCE_IMAGE. */
   Image *image;
 
 } PaintModeSettings;
@@ -2292,11 +2292,11 @@ typedef enum eImagePaintMode {
 /** PaintModeSettings.canvas_source */
 typedef enum ePaintCanvasSource {
   /** Paint on the active color attribute (vertex color) layer. */
-  PAINT_CANVAS_COLOR_ATTRIBUTE = 0,
-  /** Paint on the active texture of the active material slot. */
-  PAINT_CANVAS_MATERIAL = 1,
+  PAINT_CANVAS_SOURCE_COLOR_ATTRIBUTE = 0,
+  /** Paint on the active node of the active material slot. */
+  PAINT_CANVAS_SOURCE_MATERIAL = 1,
   /** Paint on a selected image. */
-  PAINT_CANVAS_IMAGE = 2,
+  PAINT_CANVAS_SOURCE_IMAGE = 2,
 } ePaintCanvasSource;
 
 /** #ImagePaintSettings.interp */
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index 341c5aef06d..c13cc01d160 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -85,9 +85,9 @@ static const EnumPropertyItem rna_enum_gpencil_paint_mode[] = {
 #endif
 
 static const EnumPropertyItem rna_enum_canvas_source_items[] = {
-    {PAINT_CANVAS_COLOR_ATTRIBUTE, "COLOR_ATTRIBUTE", 0, "Color Attribute", ""},
-    {PAINT_CANVAS_MATERIAL, "MATERIAL", 0, "Material", ""},
-    {PAINT_CANVAS_IMAGE, "IMAGE", 0, "Image", ""},
+    {PAINT_CANVAS_SOURCE_COLOR_ATTRIBUTE, "COLOR_ATTRIBUTE", 0, "Color Attribute", ""},
+    {PAINT_CANVAS_SOURCE_MATERIAL, "MATERIAL", 0, "Material", ""},
+    {PAINT_CANVAS_SOURCE_IMAGE, "IMAGE", 0, "Image", ""},
     {0, NULL, 0, NULL, NULL},
 };
 
@@ -561,8 +561,8 @@ static bool rna_PaintModeSettings_image_poll(PointerRNA *UNUSED(ptr), PointerRNA
 static int rna_PaintModeSettings_canvas_source_get(PointerRNA *ptr)
 {
   PaintModeSettings *settings = ptr->data;
-  if (!U.experimental.use_sculpt_texture_paint && settings->canvas_source == PAINT_CANVAS_IMAGE) {
-    return PAINT_CANVAS_COLOR_ATTRIBUTE;
+  if (!U.experimental.use_sculpt_texture_paint && settings->canvas_source == PAINT_CANVAS_SOURCE_IMAGE) {
+    return PAINT_CANVAS_SOURCE_COLOR_ATTRIBUTE;
   }
 
   return settings->canvas_source;
@@ -578,7 +578,7 @@ static const EnumPropertyItem *rna_PaintModeSettings_canvas_source_itemf(bContex
 
   for (int index = 0; rna_enum_canvas_source_items[index].identifier != NULL; index++) {
     if (!U.experimental.use_sculpt_texture_paint &&
-        rna_enum_canvas_source_items[index].value == PAINT_CANVAS_IMAGE) {
+        rna_enum_canvas_source_items[index].value == PAINT_CANVAS_SOURCE_IMAGE) {
       continue;
     }
     RNA_enum_item_add(&items, &totitem, &rna_enum_canvas_source_items[index]);