[Bf-blender-cvs] [9644f3acfbe] temp-T96709-painting-target: Small changes to BKE_material API.
Jeroen Bakker
noreply at git.blender.org
Wed Mar 30 08:19:30 CEST 2022
Commit: 9644f3acfbe731de70a9e56f45dba2b0e1c2af35
Author: Jeroen Bakker
Date: Wed Mar 30 08:11:25 2022 +0200
Branches: temp-T96709-painting-target
https://developer.blender.org/rB9644f3acfbe731de70a9e56f45dba2b0e1c2af35
Small changes to BKE_material API.
===================================================================
M source/blender/blenkernel/BKE_material.h
M source/blender/blenkernel/intern/material.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h
index 080c54e4a1e..f38f6afff7e 100644
--- a/source/blender/blenkernel/BKE_material.h
+++ b/source/blender/blenkernel/BKE_material.h
@@ -7,7 +7,6 @@
* \ingroup bke
* \brief General operations, lookup, etc. for materials.
*/
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -19,12 +18,6 @@ struct Object;
struct Scene;
struct bNode;
-/** Bitwise filter for updating paint slots. */
-typedef enum ePaintSlotFilter {
- PAINT_SLOT_IMAGE = 1 << 0,
- PAINT_SLOT_COLOR_ATTRIBUTE = 1 << 1,
-} ePaintSlotFilter;
-
/* -------------------------------------------------------------------- */
/** \name Module
* \{ */
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index ee3762e29bf..0869d63300d 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -1347,6 +1347,12 @@ static bNode *nodetree_uv_node_recursive(bNode *node)
return NULL;
}
+/** Bitwise filter for updating paint slots. */
+typedef enum ePaintSlotFilter {
+ PAINT_SLOT_IMAGE = 1 << 0,
+ PAINT_SLOT_COLOR_ATTRIBUTE = 1 << 1,
+} ePaintSlotFilter;
+
typedef bool (*ForEachTexNodeCallback)(bNode *node, void *userdata);
static bool ntree_foreach_texnode_recursive(bNodeTree *nodetree,
ForEachTexNodeCallback callback,
More information about the Bf-blender-cvs
mailing list