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>2019-04-02 09:54:04 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-02 09:54:04 +0300
commit6470056a0d1ed1a07c823d46ea292d69d3c2a8fb (patch)
treed0aebdd1981fba294408cdda08e799e7f0e525e0 /source/blender/draw/intern
parent17c15798c35f33e4150beacb0f7b612bcef90c3e (diff)
Cleanup: empty expression statement warning
Diffstat (limited to 'source/blender/draw/intern')
-rw-r--r--source/blender/draw/intern/DRW_render.h4
-rw-r--r--source/blender/draw/intern/draw_anim_viz.c2
-rw-r--r--source/blender/draw/intern/draw_cache.c7
-rw-r--r--source/blender/draw/intern/draw_manager.c4
-rw-r--r--source/blender/draw/intern/draw_view.c2
5 files changed, 10 insertions, 9 deletions
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index 5c505f1b234..3d4618021e8 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -120,7 +120,7 @@ typedef char DRWViewportEmptyList;
DRW_multisamples_resolve(dtxl->multisample_depth, dtxl->multisample_color, true); \
DRW_stats_query_end(); \
} \
-}
+} ((void)0)
#define MULTISAMPLE_SYNC_DISABLE_NO_DEPTH(dfbl, dtxl) { \
if (dfbl->multisample_fb != NULL) { \
@@ -129,7 +129,7 @@ typedef char DRWViewportEmptyList;
DRW_multisamples_resolve(dtxl->multisample_depth, dtxl->multisample_color, false); \
DRW_stats_query_end(); \
} \
-}
+} ((void)0)
diff --git a/source/blender/draw/intern/draw_anim_viz.c b/source/blender/draw/intern/draw_anim_viz.c
index 09625b9b47e..03566de01d2 100644
--- a/source/blender/draw/intern/draw_anim_viz.c
+++ b/source/blender/draw/intern/draw_anim_viz.c
@@ -309,7 +309,7 @@ static void MPATH_draw_scene(void *vedata)
DRW_draw_pass(psl->lines);
DRW_draw_pass(psl->points);
- MULTISAMPLE_SYNC_DISABLE_NO_DEPTH(dfbl, dtxl)
+ MULTISAMPLE_SYNC_DISABLE_NO_DEPTH(dfbl, dtxl);
}
/* *************************** Draw Engine Defines ****************************** */
diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c
index cdbbcf9ec2b..f369048ec2f 100644
--- a/source/blender/draw/intern/draw_cache.c
+++ b/source/blender/draw/intern/draw_cache.c
@@ -2751,9 +2751,10 @@ static const float staticSine[16] = {
0.994521895368f, 1.0f,
};
-#define set_vert(a, b, quarter) \
- copy_v2_fl2(pos, (quarter % 2 == 0) ? -(a) : (a), (quarter < 2) ? -(b) : (b)); \
- GPU_vertbuf_attr_set(vbo, attr_id.pos, v++, pos);
+#define set_vert(a, b, quarter) { \
+ copy_v2_fl2(pos, (quarter % 2 == 0) ? -(a) : (a), (quarter < 2) ? -(b) : (b)); \
+ GPU_vertbuf_attr_set(vbo, attr_id.pos, v++, pos); \
+ } ((void)0)
GPUBatch *DRW_cache_bone_dof_sphere_get(void)
{
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 44ec9926d59..66b5ec22af9 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1716,7 +1716,7 @@ bool DRW_render_check_grease_pencil(Depsgraph *depsgraph)
}
}
}
- DEG_OBJECT_ITER_FOR_RENDER_ENGINE_END
+ DEG_OBJECT_ITER_FOR_RENDER_ENGINE_END;
return false;
}
@@ -1959,7 +1959,7 @@ void DRW_render_object_iter(
drw_batch_cache_generate_requested(ob);
}
}
- DEG_OBJECT_ITER_END
+ DEG_OBJECT_ITER_END;
}
/* Assume a valid gl context is bound (and that the gl_context_mutex has been acquired).
diff --git a/source/blender/draw/intern/draw_view.c b/source/blender/draw/intern/draw_view.c
index 71bf37b4e7a..b907452dad2 100644
--- a/source/blender/draw/intern/draw_view.c
+++ b/source/blender/draw/intern/draw_view.c
@@ -247,7 +247,7 @@ void DRW_draw_cursor(void)
#define CURSOR_EDGE(axis_vec, axis, sign) { \
CURSOR_VERT(axis_vec, axis, sign 1.0f); \
CURSOR_VERT(axis_vec, axis, sign 0.25f); \
- }
+ } ((void)0)
for (int axis = 0; axis < 3; axis++) {
float axis_vec[3] = {0};