Cleanup: quiet extra-semicolon warning
This commit is contained in:
parent
20bc30706b
commit
bbc5c1e36f
|
@ -180,7 +180,8 @@ typedef void (*BKE_scene_collections_Cb)(struct Collection *ob, void *data);
|
|||
#define FOREACH_COLLECTION_VISIBLE_OBJECT_RECURSIVE_END \
|
||||
} \
|
||||
} \
|
||||
}
|
||||
} \
|
||||
((void)0)
|
||||
|
||||
#define FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN(_collection, _object) \
|
||||
for (Base *_base = (Base *)BKE_collection_object_cache_get(_collection).first; _base; \
|
||||
|
|
|
@ -491,7 +491,8 @@ const char *nodeStaticSocketInterfaceType(int type, int subtype);
|
|||
#define NODE_SOCKET_TYPES_END \
|
||||
} \
|
||||
BLI_ghashIterator_free(__node_socket_type_iter__); \
|
||||
}
|
||||
} \
|
||||
((void)0)
|
||||
|
||||
struct bNodeSocket *nodeFindSocket(struct bNode *node, int in_out, const char *identifier);
|
||||
struct bNodeSocket *nodeAddSocket(struct bNodeTree *ntree,
|
||||
|
|
|
@ -3143,7 +3143,7 @@ void psys_cache_edit_paths(Depsgraph *depsgraph,
|
|||
iter_data.use_weight = use_weight;
|
||||
|
||||
if (use_weight) {
|
||||
; /* use weight painting colors now... */
|
||||
/* use weight painting colors now... */
|
||||
}
|
||||
else {
|
||||
iter_data.sel_col[0] = (float)edit->sel_col[0] / 255.0f;
|
||||
|
|
|
@ -3515,7 +3515,7 @@ void sbObjectStep(struct Depsgraph *depsgraph,
|
|||
return;
|
||||
}
|
||||
else if (cache_result == PTCACHE_READ_OLD) {
|
||||
; /* do nothing */
|
||||
/* pass */
|
||||
}
|
||||
else if (/*ob->id.lib || */ (
|
||||
cache->flag &
|
||||
|
|
|
@ -129,12 +129,13 @@ static const char *STUDIOLIGHT_MATCAP_DEFAULT = "basic_1.exr";
|
|||
static void studiolight_free(struct StudioLight *sl)
|
||||
{
|
||||
#define STUDIOLIGHT_DELETE_ICON(s) \
|
||||
{ \
|
||||
do { \
|
||||
if (s != 0) { \
|
||||
BKE_icon_delete(s); \
|
||||
s = 0; \
|
||||
} \
|
||||
}
|
||||
} while (0)
|
||||
|
||||
if (sl->free_function) {
|
||||
sl->free_function(sl, sl->free_function_data);
|
||||
}
|
||||
|
|
|
@ -335,7 +335,7 @@ void DepsgraphNodeBuilder::begin_build()
|
|||
entry_tag.name = op_node->name;
|
||||
entry_tag.name_tag = op_node->name_tag;
|
||||
saved_entry_tags_.push_back(entry_tag);
|
||||
};
|
||||
}
|
||||
GSET_FOREACH_END();
|
||||
|
||||
/* Make sure graph has no nodes left from previous state. */
|
||||
|
|
|
@ -56,7 +56,9 @@
|
|||
|
||||
# define PROFILE_TIMER_FALLOFF 0.04
|
||||
|
||||
# define PROFILE_START(time_start) double time_start = PIL_check_seconds_timer();
|
||||
# define PROFILE_START(time_start) \
|
||||
double time_start = PIL_check_seconds_timer(); \
|
||||
((void)0)
|
||||
|
||||
# define PROFILE_END_ACCUM(time_accum, time_start) \
|
||||
{ \
|
||||
|
|
|
@ -395,7 +395,7 @@ typedef struct ProjPaintState {
|
|||
* helps as an extra validation step for seam detection. */
|
||||
char *faceWindingFlags;
|
||||
/** expanded UVs for faces to use as seams. */
|
||||
LoopSeamData(*loopSeamData);
|
||||
LoopSeamData *loopSeamData;
|
||||
/** Only needed for when seam_bleed_px is enabled, use to find UV seams. */
|
||||
LinkNode **vertFaces;
|
||||
/** Seams per vert, to find adjacent seams. */
|
||||
|
|
|
@ -562,7 +562,8 @@ bool GPU_framebuffer_check_valid(GPUFrameBuffer *fb, char err_out[256])
|
|||
|
||||
#define CHECK_FRAMEBUFFER_IS_BOUND(_fb) \
|
||||
BLI_assert(GPU_framebuffer_bound(_fb)); \
|
||||
UNUSED_VARS_NDEBUG(_fb);
|
||||
UNUSED_VARS_NDEBUG(_fb); \
|
||||
((void)0)
|
||||
|
||||
/* Needs to be done after binding. */
|
||||
void GPU_framebuffer_viewport_set(GPUFrameBuffer *fb, int x, int y, int w, int h)
|
||||
|
|
|
@ -465,7 +465,7 @@ static int add_name(const char *str)
|
|||
}
|
||||
else if (str[j] == ')') {
|
||||
DEBUG_PRINTF(3, "offsetting for brace\n");
|
||||
; /* don't get extra offset */
|
||||
/* don't get extra offset */
|
||||
}
|
||||
else {
|
||||
printf("Error during tokening function pointer argument list\n");
|
||||
|
|
|
@ -594,9 +594,7 @@ static void rna_ColorManagedColorspaceSettings_reload_update(Main *bmain,
|
|||
bool seq_found = false;
|
||||
|
||||
if (&scene->sequencer_colorspace_settings != colorspace_settings) {
|
||||
SEQ_BEGIN (scene->ed, seq)
|
||||
;
|
||||
{
|
||||
SEQ_BEGIN (scene->ed, seq) {
|
||||
if (seq->strip && &seq->strip->colorspace_settings == colorspace_settings) {
|
||||
seq_found = true;
|
||||
break;
|
||||
|
@ -617,9 +615,7 @@ static void rna_ColorManagedColorspaceSettings_reload_update(Main *bmain,
|
|||
BKE_sequencer_preprocessed_cache_cleanup_sequence(seq);
|
||||
}
|
||||
else {
|
||||
SEQ_BEGIN (scene->ed, seq)
|
||||
;
|
||||
{
|
||||
SEQ_BEGIN (scene->ed, seq) {
|
||||
BKE_sequence_free_anim(seq);
|
||||
}
|
||||
SEQ_END;
|
||||
|
|
|
@ -32,8 +32,8 @@ extern char BaseMathObject_is_frozen_doc[];
|
|||
extern char BaseMathObject_owner_doc[];
|
||||
|
||||
#define BASE_MATH_NEW(struct_name, root_type, base_type) \
|
||||
(struct_name *)((base_type ? (base_type)->tp_alloc(base_type, 0) : \
|
||||
_PyObject_GC_New(&(root_type))));
|
||||
((struct_name *)((base_type ? (base_type)->tp_alloc(base_type, 0) : \
|
||||
_PyObject_GC_New(&(root_type)))))
|
||||
|
||||
/** BaseMathObject.flag */
|
||||
enum {
|
||||
|
|
|
@ -31,7 +31,8 @@
|
|||
texres->tin = 0.0f; \
|
||||
else if (texres->tin > 1.0f) \
|
||||
texres->tin = 1.0f; \
|
||||
}
|
||||
} \
|
||||
((void)0)
|
||||
|
||||
#define BRICONTRGB \
|
||||
texres->tr = tex->rfac * ((texres->tr - 0.5f) * tex->contrast + tex->bright - 0.5f); \
|
||||
|
@ -58,7 +59,8 @@
|
|||
if (texres->tb < 0.0f) \
|
||||
texres->tb = 0.0f; \
|
||||
} \
|
||||
}
|
||||
} \
|
||||
((void)0)
|
||||
|
||||
struct ImBuf;
|
||||
struct Image;
|
||||
|
|
|
@ -2864,8 +2864,10 @@ RenderPass *RE_pass_find_by_name(volatile RenderLayer *rl, const char *name, con
|
|||
RenderPass *RE_pass_find_by_type(volatile RenderLayer *rl, int passtype, const char *viewname)
|
||||
{
|
||||
#define CHECK_PASS(NAME) \
|
||||
if (passtype == SCE_PASS_##NAME) \
|
||||
return RE_pass_find_by_name(rl, RE_PASSNAME_##NAME, viewname);
|
||||
if (passtype == SCE_PASS_##NAME) { \
|
||||
return RE_pass_find_by_name(rl, RE_PASSNAME_##NAME, viewname); \
|
||||
} \
|
||||
((void)0)
|
||||
|
||||
CHECK_PASS(COMBINED);
|
||||
CHECK_PASS(Z);
|
||||
|
|
|
@ -364,6 +364,7 @@ static void wm_block_confirm_quit_cancel(bContext *C, void *arg_block, void *UNU
|
|||
}
|
||||
|
||||
/** Discard the file changes and quit */
|
||||
ATTR_NORETURN
|
||||
static void wm_block_confirm_quit_discard(bContext *C, void *arg_block, void *UNUSED(arg))
|
||||
{
|
||||
wmWindow *win = CTX_wm_window(C);
|
||||
|
|
Loading…
Reference in New Issue