Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source/blender/blenkernel
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/BKE_node.h16
-rw-r--r--source/blender/blenkernel/BKE_sequencer.h2
-rw-r--r--source/blender/blenkernel/intern/bpath.c4
-rw-r--r--source/blender/blenkernel/intern/depsgraph.c4
-rw-r--r--source/blender/blenkernel/intern/ipo.c3
-rw-r--r--source/blender/blenkernel/intern/library_query.c3
-rw-r--r--source/blender/blenkernel/intern/library_remap.c4
-rw-r--r--source/blender/blenkernel/intern/node.c22
-rw-r--r--source/blender/blenkernel/intern/sequencer.c3
9 files changed, 28 insertions, 33 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 07a50a782c5..5f0635037c2 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -37,7 +37,7 @@
#include "DNA_listBase.h"
-/* for FOREACH_NODETREE */
+/* for FOREACH_NODETREE_BEGIN */
#include "DNA_lamp_types.h"
#include "DNA_material_types.h"
#include "DNA_node_types.h"
@@ -410,7 +410,7 @@ struct GHashIterator *nodeTypeGetIterator(void);
#define NODE_TYPES_END \
} \
BLI_ghashIterator_free(__node_type_iter__); \
-}
+} ((void)0)
struct bNodeSocketType *nodeSocketTypeFind(const char *idname);
void nodeRegisterSocketType(struct bNodeSocketType *stype);
@@ -646,17 +646,17 @@ void BKE_node_tree_unlink_id(ID *id, struct bNodeTree *ntree);
* Examples:
*
* \code{.c}
- * FOREACH_NODETREE(bmain, nodetree, id) {
+ * FOREACH_NODETREE_BEGIN(bmain, nodetree, id) {
* if (id == nodetree)
* printf("This is a linkable node tree");
- * } FOREACH_NODETREE_END
+ * } FOREACH_NODETREE_END;
*
- * FOREACH_NODETREE(bmain, nodetree, id) {
+ * FOREACH_NODETREE_BEGIN(bmain, nodetree, id) {
* if (nodetree->idname == "ShaderNodeTree")
* printf("This is a shader node tree);
* if (GS(id) == ID_MA)
* printf(" and it's owned by a material");
- * } FOREACH_NODETREE_END
+ * } FOREACH_NODETREE_END;
* \endcode
*
* \{
@@ -677,7 +677,7 @@ void BKE_node_tree_iter_init(struct NodeTreeIterStore *ntreeiter, struct Main *b
bool BKE_node_tree_iter_step(struct NodeTreeIterStore *ntreeiter,
struct bNodeTree **r_nodetree, struct ID **r_id);
-#define FOREACH_NODETREE(bmain, _nodetree, _id) \
+#define FOREACH_NODETREE_BEGIN(bmain, _nodetree, _id) \
{ \
struct NodeTreeIterStore _nstore; \
bNodeTree *_nodetree; \
@@ -690,7 +690,7 @@ bool BKE_node_tree_iter_step(struct NodeTreeIterStore *ntreeiter,
#define FOREACH_NODETREE_END \
} \
} \
-}
+} ((void)0)
/** \} */
diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h
index 00fd4ded8c6..ebe732d2336 100644
--- a/source/blender/blenkernel/BKE_sequencer.h
+++ b/source/blender/blenkernel/BKE_sequencer.h
@@ -90,7 +90,7 @@ void BKE_sequence_iterator_end(SeqIterator *iter);
#define SEQ_END \
} \
BKE_sequence_iterator_end(&iter_macro); \
- }
+ } ((void)0)
typedef struct SeqRenderData {
struct Main *bmain;
diff --git a/source/blender/blenkernel/intern/bpath.c b/source/blender/blenkernel/intern/bpath.c
index 88a4b7905ef..0ada712a855 100644
--- a/source/blender/blenkernel/intern/bpath.c
+++ b/source/blender/blenkernel/intern/bpath.c
@@ -616,9 +616,7 @@ void BKE_bpath_traverse_id(Main *bmain, ID *id, BPathVisitor visit_cb, const int
rewrite_path_fixed(seq->strip->dir, visit_cb, absbase, bpath_user_data);
}
}
-
- }
- SEQ_END
+ } SEQ_END;
}
break;
}
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index 15d08f5a230..621cd6cf5c8 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -2792,7 +2792,7 @@ static void dag_id_flush_update(Main *bmain, Scene *sce, ID *id)
* could be with the current depsgraph design/
*/
if (idtype == ID_IM) {
- FOREACH_NODETREE(bmain, ntree, parent_id) {
+ FOREACH_NODETREE_BEGIN(bmain, ntree, parent_id) {
if (ntree->type == NTREE_SHADER) {
bNode *node;
for (node = ntree->nodes.first; node; node = node->next) {
@@ -2802,7 +2802,7 @@ static void dag_id_flush_update(Main *bmain, Scene *sce, ID *id)
}
}
}
- } FOREACH_NODETREE_END
+ } FOREACH_NODETREE_END;
}
if (idtype == ID_MSK) {
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index d3ac5a39c9f..aae208dd967 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -1944,8 +1944,7 @@ void do_versions_ipos_to_animato(Main *bmain)
id_us_min(&seq->ipo->id);
seq->ipo = NULL;
- }
- SEQ_END
+ } SEQ_END;
}
}
diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c
index 902cabad857..f0f23eaa87d 100644
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -426,8 +426,7 @@ void BKE_library_foreach_ID_link(Main *bmain, ID *id, LibraryIDLinkCallback call
for (SequenceModifierData *smd = seq->modifiers.first; smd; smd = smd->next) {
CALLBACK_INVOKE(smd->mask_id, IDWALK_CB_USER);
}
- }
- SEQ_END
+ } SEQ_END;
}
diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c
index ba151ca6925..e5d313e5018 100644
--- a/source/blender/blenkernel/intern/library_remap.c
+++ b/source/blender/blenkernel/intern/library_remap.c
@@ -361,10 +361,10 @@ static void libblock_remap_data_postprocess_nodetree_update(Main *bmain, ID *new
ntreeVerifyNodes(bmain, new_id);
/* Update node trees as necessary. */
- FOREACH_NODETREE(bmain, ntree, id) {
+ FOREACH_NODETREE_BEGIN(bmain, ntree, id) {
/* make an update call for the tree */
ntreeUpdateTree(bmain, ntree);
- } FOREACH_NODETREE_END
+ } FOREACH_NODETREE_END;
}
/**
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 183fa37f84b..04cc58f373f 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -229,7 +229,7 @@ static void update_typeinfo(Main *bmain, const struct bContext *C, bNodeTreeType
if (!bmain)
return;
- FOREACH_NODETREE(bmain, ntree, id) {
+ FOREACH_NODETREE_BEGIN(bmain, ntree, id) {
bNode *node;
bNodeSocket *sock;
@@ -260,7 +260,7 @@ static void update_typeinfo(Main *bmain, const struct bContext *C, bNodeTreeType
if (socktype && STREQ(sock->idname, socktype->idname))
node_socket_set_typeinfo(ntree, sock, unregister ? NULL : socktype);
}
- FOREACH_NODETREE_END
+ FOREACH_NODETREE_END;
}
/* Try to initialize all typeinfo in a node tree.
@@ -921,7 +921,7 @@ bNode *nodeAddStaticNode(const struct bContext *C, bNodeTree *ntree, int type)
{
const char *idname = NULL;
- NODE_TYPES_BEGIN(ntype)
+ NODE_TYPES_BEGIN(ntype) {
/* do an extra poll here, because some int types are used
* for multiple node types, this helps find the desired type
*/
@@ -929,7 +929,7 @@ bNode *nodeAddStaticNode(const struct bContext *C, bNodeTree *ntree, int type)
idname = ntype->idname;
break;
}
- NODE_TYPES_END
+ } NODE_TYPES_END;
if (!idname) {
printf("Error: static node type %d undefined\n", type);
return NULL;
@@ -2991,13 +2991,13 @@ static void ntree_validate_links(bNodeTree *ntree)
void ntreeVerifyNodes(struct Main *main, struct ID *id)
{
- FOREACH_NODETREE(main, ntree, owner_id) {
+ FOREACH_NODETREE_BEGIN(main, ntree, owner_id) {
bNode *node;
for (node = ntree->nodes.first; node; node = node->next)
if (node->typeinfo->verifyfunc)
node->typeinfo->verifyfunc(ntree, node, id);
- } FOREACH_NODETREE_END
+ } FOREACH_NODETREE_END;
}
void ntreeUpdateTree(Main *bmain, bNodeTree *ntree)
@@ -3645,23 +3645,23 @@ void init_nodesystem(void)
void free_nodesystem(void)
{
if (nodetypes_hash) {
- NODE_TYPES_BEGIN(nt)
+ NODE_TYPES_BEGIN(nt) {
if (nt->ext.free) {
nt->ext.free(nt->ext.data);
}
- NODE_TYPES_END
+ } NODE_TYPES_END;
BLI_ghash_free(nodetypes_hash, NULL, node_free_type);
nodetypes_hash = NULL;
}
if (nodesockettypes_hash) {
- NODE_SOCKET_TYPES_BEGIN(st)
+ NODE_SOCKET_TYPES_BEGIN(st) {
if (st->ext_socket.free)
st->ext_socket.free(st->ext_socket.data);
if (st->ext_interface.free)
st->ext_interface.free(st->ext_interface.data);
- NODE_SOCKET_TYPES_END
+ } NODE_SOCKET_TYPES_END;
BLI_ghash_free(nodesockettypes_hash, NULL, node_free_socket_type);
nodesockettypes_hash = NULL;
@@ -3683,7 +3683,7 @@ void free_nodesystem(void)
/* -------------------------------------------------------------------- */
-/* NodeTree Iterator Helpers (FOREACH_NODETREE) */
+/* NodeTree Iterator Helpers (FOREACH_NODETREE_BEGIN) */
void BKE_node_tree_iter_init(struct NodeTreeIterStore *ntreeiter, struct Main *bmain)
{
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 0d506effae6..c02a47db321 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -474,8 +474,7 @@ void BKE_sequencer_editing_free(Scene *scene, const bool do_id_user)
{
/* handle cache freeing above */
BKE_sequence_free_ex(scene, seq, false, do_id_user);
- }
- SEQ_END
+ } SEQ_END;
BLI_freelistN(&ed->metastack);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 18:05:29 +0300