Commit: 6429e6c91ef4422083ed56b068dea636a322fe12
Author: Campbell Barton
Date: Fri Nov 30 15:35:15 2018 +1100
Branches: master
https://developer.blender.org/rB6429e6c91ef4422083ed56b068dea636a322fe12
Cleanup: ensure '_END' macros end with a semicolon
Missing these breaks auto-indent for editors that don't expand macros.
===================================================================
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/BKE_sequencer.h
M source/blender/blenkernel/intern/bpath.c
M source/blender/blenkernel/intern/ipo.c
M source/blender/blenkernel/intern/library_query.c
M source/blender/blenkernel/intern/node.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_250.c
M source/blender/blenloader/intern/versioning_260.c
M source/blender/blenloader/intern/versioning_270.c
M source/blender/blenloader/intern/versioning_legacy.c
M source/blender/blenloader/intern/writefile.c
M source/blender/editors/sound/sound_ops.c
M source/blender/editors/space_image/image_ops.c
M source/blender/editors/space_node/drawnode.c
M source/blender/editors/space_node/node_templates.c
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/editors/space_sequencer/sequencer_modifier.c
M source/blender/editors/space_sequencer/sequencer_select.c
M source/blender/imbuf/intern/colormanagement.c
M source/blender/makesrna/RNA_access.h
M source/blender/makesrna/intern/rna_nodetree.c
===================================================================
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);
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index ead3b324644..57d4978c776 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5867,8 +5867,7 @@ static void lib_link_scene(FileData *fd, Main *main)
BLI_listbase_clear(&seq->anims);
lib_link_sequence_modifiers(fd, sce,
&seq->modifiers);
- }
- SEQ_END
+ } SEQ_END;
for (TimeMarker *marker = sce->markers.first; marker;
marker = marker->next) {
if (marker->camera) {
@@ -6162,8 +6161,7 @@ static void direct_link_scene(FileData *fd, Scene *sce)
}
direct_link_sequence_modifiers(fd, &seq->modifiers);
- }
- SEQ_END
+ } SEQ_END;
/* link metastack, slight abuse of structs here, have to
restore pointer to internal part in struct */
{
@@ -9744,8 +9742,7 @@ static void expand_scene(FileData *fd, Main *mainvar,
Scene *sce)
if (seq->clip) expand_doit(fd, mainvar, seq->clip);
if (seq->mask) expand_doit(fd, mainvar, seq->mask);
if (seq->sound) expand_doit(fd, mainvar, seq->sound);
- }
- SEQ_END
+ } SEQ_END;
}
if (sce->rigidbody_world) {
diff --git a/source/blender/blenloader/intern/versioning_250.c
b/source/blender/blenloader/intern/versioning_250.c
index 835acbc853d..a6d8b6de606 100644
--- a/source/blender/blenloader/intern/versioning_250.c
+++ b/source/blender/blenloader/intern/versioning_250.c
@@ -793,8 +793,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main
*bmain)
}
#undef SEQ_USE_PROXY_CUSTOM_DIR
#undef SEQ_USE_PROXY_CUSTOM_FILE
- }
- SEQ_END
+ } SEQ_END;
}
}
@@ -1758,8 +1757,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main
*bmain)
SEQ_BEGIN (sce->ed, seq)
{
seq->volume = 1.0f;
- }
- SEQ_END
+ } SEQ_END;
}
/* particle brush strength factor was changed from int to float
*/
@@ -2034,8 +2032,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main
*bmain)
if (seq->sat == 0.0f) {
seq->sat = 1.0f;
}
- }
- SEQ_END
+ } SEQ_END;
}
}
@@ -2580,8 +2577,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main
*bmain)
SEQ_BEGIN(scene->ed, seq)
{
seq->pitch = 1.0f;
- }
- SEQ_END
+ } SEQ_END;
}
}
diff --git a/source/blender/blenloader/intern/versioning_260.c
b/source/blender/blenloader/intern/versioning_260.c
index f630dbe1aaf..af291981e7f 100644
--- a/source/blender/blenloader/intern/versioning_260.c
+++ b/source/blender/blenloader/intern/versioning_260.c
@@ -1520,8 +1520,7 @@ void blo_do_versions_260(FileData *fd, Library
*UNUSED(lib), Main *bmain)
MEM_freeN(strip->color_balance);
strip->color_balance = NULL;
}
- }
- SEQ_END
+ } SEQ_END;
}
}
}
@@ -1880,8 +1879,7 @@ void blo_do_versions_260(FileData *fd, Library
*UNUSED(lib), Main *bmain)
else {
BKE_sequence_alpha_mode_from_extension(seq);
}
- }
- SEQ_END
+ } SEQ_END;
if (scene->r.bake_samples == 0)
scene->r.bake_samples = 256;
@@ -2586,8 +2584,7 @@ void blo_do_versions_260(FileData *fd, Library
*UNUSED(lib), Main *bmain)
WipeVars *wv = seq->effectdata;
wv->angle = DEG2RADF(wv->angle);
}
- }
- SEQ_END
+ } SEQ_END;
}
FOREACH_NODETREE_BEGIN(bmain, ntree, id) {
diff --git a/source/blender/blenloader/intern/versioning_270.c
b/source/blender/blenloader/intern/versioning_270.c
index 64c6cc9a052..7884a628147 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -940,8 +940,7 @@ void blo_do_versions_270(FileData *fd, Library
*UNUSED(lib), Main *bmain)
#undef SEQ_USE_PROXY_CUSTOM_DIR
#undef SEQ_USE_PROXY_CUSTOM_FILE
- }
- SEQ_END
+ } SEQ_END;
}
for (screen = bmain->screen.first; screen; screen =
screen->id.next) {
@@ -1325,8 +1324,7 @@ void blo_do_versions_270(FileData *fd, Library
*UNUSED(lib), Main *bmain)
copy_v4_fl(data->color, 1.0f);
data->shadow_color[3] = 1.0f;
}
- }
- SEQ_END
+ } SEQ_END;
}
/* Adding "Properties" region to DopeSheet */
diff --git a/source/blender/blenloader/intern/versioning_legacy.c
b/source/blender/blenloader/intern/versioning_legacy.c
index 48d90787b51..9708e24b351 100644
--- a/source/blender/blenloader/intern/versioning_legacy.c
+++ b/source/blender/blenloader/intern/versioning_legacy.c
@@ -1816,8 +1816,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib,
Main *bmain)
{
if (seq->type == SEQ_TYPE_IMAGE ||
seq->type == SEQ_TYPE_MOVIE)
seq->alpha_mode =
SEQ_ALPHA_STRAIGHT;
- }
- SEQ_END
+ } SEQ_END;
}
sce = sce->id.next;
@@ -3184,8 +3183,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib,
Main *bmain)
{
if (seq->blend_mode == 0)
seq->blend_opacity = 100.0f;
- }
- SEQ_END
+ } SEQ_END;
}
}
@@ -3540,8 +3538,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib,
Main *bmain)
if (seq->strip && seq->strip->proxy) {
seq->strip->proxy->quality = 90;
}
- }
- SEQ_END
+ } SEQ_END;
}
sce = sce->id.next;
diff --git a/source/blender/blenloader/intern/writefile.c
b/source/blender/blenloader/intern/writefile.c
index 2283928b1a8..4f48318582a 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2565,8 +2565,7 @@ static void write_scene(WriteData *wd, Scene *sce)
seq->strip->done = false;
}
writestruct(wd, DATA, Seq
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
