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
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-11-30 07:35:15 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-11-30 07:35:15 +0300
commit6429e6c91ef4422083ed56b068dea636a322fe12 (patch)
treed457ed7e38d74ca46c4b71876757f47ed0563cf1 /source/blender/blenkernel
parent3612ce55796427a67ba070df165b46698b2d9ace (diff)
Cleanup: ensure '_END' macros end with a semicolon
Missing these breaks auto-indent for editors that don't expand macros.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/BKE_node.h2
-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/ipo.c3
-rw-r--r--source/blender/blenkernel/intern/library_query.c3
-rw-r--r--source/blender/blenkernel/intern/node.c12
-rw-r--r--source/blender/blenkernel/intern/sequencer.c3
7 files changed, 12 insertions, 17 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 852285492d2..3d78b95001d 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -413,7 +413,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);
diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h
index c408597de32..705143480d2 100644
--- a/source/blender/blenkernel/BKE_sequencer.h
+++ b/source/blender/blenkernel/BKE_sequencer.h
@@ -89,7 +89,7 @@ void BKE_sequence_iterator_end(SeqIterator *iter);
#define SEQ_END \
} \
BKE_sequence_iterator_end(&iter_macro); \
- }
+ } ((void)0)
typedef struct SeqRenderData {
struct EvaluationContext *eval_ctx;
diff --git a/source/blender/blenkernel/intern/bpath.c b/source/blender/blenkernel/intern/bpath.c
index 0b191e1f69b..f80a13343d5 100644
--- a/source/blender/blenkernel/intern/bpath.c
+++ b/source/blender/blenkernel/intern/bpath.c
@@ -631,9 +631,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/ipo.c b/source/blender/blenkernel/intern/ipo.c
index c11f2368197..effbff37c33 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -1976,8 +1976,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 3292f0d6640..f5367f6f8b3 100644
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -455,8 +455,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;
}
CALLBACK_INVOKE(scene->gpd, IDWALK_CB_USER);
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 82f619da9c6..2946fb29863 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -918,7 +918,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
*/
@@ -926,7 +926,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;
@@ -3732,23 +3732,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;
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index c2a96d4f1ff..57b3cd41047 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -469,8 +469,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);