tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Cleanup: extra-semi-stmt warning

This commit is contained in:
Campbell Barton 2019-06-06 10:16:18 +10:00
parent 0f6ac1883d
commit 5db4608f70
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/draw/intern/DRW_render.h
View File

@ -403,28 +403,28 @@ void DRW_shgroup_call_ex(DRWShadingGroup *shgroup,
/* If ob is NULL, unit modelmatrix is assumed and culling is bypassed. */
#define DRW_shgroup_call(shgrp, geom, ob) \
DRW_shgroup_call_ex(shgrp, ob, NULL, geom, 0, 0, false, NULL);
DRW_shgroup_call_ex(shgrp, ob, NULL, geom, 0, 0, false, NULL)
/* Same as DRW_shgroup_call but override the obmat. Not culled. */
#define DRW_shgroup_call_obmat(shgrp, geom, obmat) \
DRW_shgroup_call_ex(shgrp, NULL, obmat, geom, 0, 0, false, NULL);
DRW_shgroup_call_ex(shgrp, NULL, obmat, geom, 0, 0, false, NULL)
/* TODO(fclem) remove this when we have DRWView */
/* user_data is used by DRWCallVisibilityFn defined in DRWView. */
#define DRW_shgroup_call_with_callback(shgrp, geom, ob, user_data) \
DRW_shgroup_call_ex(shgrp, ob, NULL, geom, 0, 0, false, user_data);
DRW_shgroup_call_ex(shgrp, ob, NULL, geom, 0, 0, false, user_data)
/* Same as DRW_shgroup_call but bypass culling even if ob is not NULL. */
#define DRW_shgroup_call_no_cull(shgrp, geom, ob) \
DRW_shgroup_call_ex(shgrp, ob, NULL, geom, 0, 0, true, NULL);
DRW_shgroup_call_ex(shgrp, ob, NULL, geom, 0, 0, true, NULL)
/* Only draw a certain range of geom. */
#define DRW_shgroup_call_range(shgrp, geom, ob, v_sta, v_ct) \
DRW_shgroup_call_ex(shgrp, ob, NULL, geom, v_sta, v_ct, false, NULL);
DRW_shgroup_call_ex(shgrp, ob, NULL, geom, v_sta, v_ct, false, NULL)
/* Same as DRW_shgroup_call_range but override the obmat. Special for gpencil. */
#define DRW_shgroup_call_range_obmat(shgrp, geom, obmat, v_sta, v_ct) \
DRW_shgroup_call_ex(shgrp, NULL, obmat, geom, v_sta, v_ct, false, NULL);
DRW_shgroup_call_ex(shgrp, NULL, obmat, geom, v_sta, v_ct, false, NULL)
void DRW_shgroup_call_procedural_points(DRWShadingGroup *sh, Object *ob, uint point_ct);
void DRW_shgroup_call_procedural_lines(DRWShadingGroup *sh, Object *ob, uint line_ct);

2
source/blender/draw/intern/draw_manager_shader.c
View File

@ -158,7 +158,7 @@ static void drw_deferred_shader_compilation_free(void *custom_data)
/* Compile the shaders in the context they will be deleted. */
DRW_opengl_context_enable_ex(false);
DRWDeferredShader *mat_conclude;
while (mat_conclude = BLI_poptail(&comp->queue_conclude)) {
while ((mat_conclude = BLI_poptail(&comp->queue_conclude))) {
GPU_material_compile(mat_conclude->mat);
drw_deferred_shader_free(mat_conclude);
}

2
source/blender/editors/physics/physics_fluid.c
View File

@ -966,7 +966,7 @@ static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, shor
/* Make sure it corresponds to startFrame setting
* (old: noFrames = scene->r.efra - scene->r.sfra +1). */
;
noFrames = scene->r.efra - 0;
if (noFrames <= 0) {
BKE_report(reports, RPT_ERROR, "No frames to export (check your animation range settings)");

5
source/blender/ikplugin/intern/itasc_plugin.cpp
View File

@ -338,14 +338,14 @@ static int initialize_chain(Object *ob, bPoseChannel *pchan_tip, bConstraint *co
while (a < size && t < tree->totchannel) {
// locate first matching channel
for (; t < tree->totchannel && tree->pchan[t] != chanlist[segcount - a - 1]; t++) {
;
/* pass */
}
if (t >= tree->totchannel) {
break;
}
for (; a < size && t < tree->totchannel && tree->pchan[t] == chanlist[segcount - a - 1];
a++, t++) {
;
/* pass */
}
}
@ -1892,7 +1892,6 @@ static void execute_scene(struct Depsgraph *depsgraph,
}
if (i < ikscene->numchan) {
// big problem
;
}
}