diff options
| -rw-r--r-- | intern/cycles/kernel/filter/filter_features_sse.h | 1 | ||||
| -rw-r--r-- | intern/mantaflow/intern/MANTA_main.cpp | 1 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/fluid.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 1 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/delaunay_2d.c | 1 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_cache_impl_mesh.c | 6 | ||||
| -rw-r--r-- | source/blender/freestyle/intern/view_map/ViewMap.cpp | 4 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_weld.c | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/intern/cycles/kernel/filter/filter_features_sse.h b/intern/cycles/kernel/filter/filter_features_sse.h index 7bbd17066fd..59d4ace2bef 100644 --- a/intern/cycles/kernel/filter/filter_features_sse.h +++ b/intern/cycles/kernel/filter/filter_features_sse.h @@ -109,7 +109,6 @@ ccl_device_inline void filter_calculate_scale_sse(float4 *scale, bool use_time) scale[2] = rcp(max(reduce_max(scale[2]), make_float4(0.01f))); if (use_time) { scale[10] = rcp(max(reduce_max(scale[6]), make_float4(0.01f))); - ; } scale[6] = rcp(max(reduce_max(scale[4]), make_float4(0.01f))); scale[7] = scale[8] = scale[9] = rcp(max(reduce_max(sqrt(scale[5])), make_float4(0.01f))); diff --git a/intern/mantaflow/intern/MANTA_main.cpp b/intern/mantaflow/intern/MANTA_main.cpp index 91853ca566b..d7c8f5491a9 100644 --- a/intern/mantaflow/intern/MANTA_main.cpp +++ b/intern/mantaflow/intern/MANTA_main.cpp @@ -1440,7 +1440,6 @@ int MANTA::writeConfiguration(FluidModifierData *mmd, int framenr) FluidDomainSettings *mds = mmd->domain; std::ostringstream ss; char cacheDir[FILE_MAX], targetFile[FILE_MAX]; - ; cacheDir[0] = '\0'; targetFile[0] = '\0'; diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c index c3db083810c..d38541c8bbe 100644 --- a/source/blender/blenkernel/intern/fluid.c +++ b/source/blender/blenkernel/intern/fluid.c @@ -3402,7 +3402,7 @@ static void BKE_fluid_modifier_processDomain(FluidModifierData *mmd, resume_guide = (!is_startframe) && (mds->cache_frame_pause_guide == scene_framenr); bool read_cache, bake_cache; - read_cache = false, + read_cache = false; bake_cache = baking_data || baking_noise || baking_mesh || baking_particles || baking_guide; bool with_gdomain; diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 4c4e88da6c7..2f6ffdfe607 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -4378,7 +4378,6 @@ static void particles_fluid_step(ParticleSimulationData *sim, 1. / fabsf(ob->scale[0]), 1. / fabsf(ob->scale[1]), 1. / fabsf(ob->scale[2])}; mul_v3_fl(scaleAbs, max_size); mul_v3_v3(pa->state.co, scaleAbs); - ; /* Match domain scale. */ mul_m4_v3(ob->obmat, pa->state.co); diff --git a/source/blender/blenlib/intern/delaunay_2d.c b/source/blender/blenlib/intern/delaunay_2d.c index 06c72a4c3d6..7287bec0849 100644 --- a/source/blender/blenlib/intern/delaunay_2d.c +++ b/source/blender/blenlib/intern/delaunay_2d.c @@ -389,7 +389,6 @@ static CDTEdge *connect_separate_parts(CDT_state *cdt, SymEdge *se1, SymEdge *se { CDTEdge *e; SymEdge *se1_rot, *se1_rotsym, *se2_rot, *se2_rotsym, *new_se, *new_se_sym; - ; BLI_assert(se1->face == cdt->outer_face && se2->face == cdt->outer_face); se1_rot = se1->rot; diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index 7408c8d0e38..ed60e16c7cc 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -987,8 +987,9 @@ void DRW_mesh_batch_cache_create_requested( if (cache->batch_requested == 0) { #ifdef DEBUG goto check; -#endif +#else return; +#endif } /* Sanity check. */ @@ -1127,8 +1128,9 @@ void DRW_mesh_batch_cache_create_requested( if ((batch_requested & ~cache->batch_ready) == 0) { #ifdef DEBUG goto check; -#endif +#else return; +#endif } cache->batch_ready |= batch_requested; diff --git a/source/blender/freestyle/intern/view_map/ViewMap.cpp b/source/blender/freestyle/intern/view_map/ViewMap.cpp index 9acd730d062..c371eba4b94 100644 --- a/source/blender/freestyle/intern/view_map/ViewMap.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMap.cpp @@ -386,7 +386,7 @@ void TVertex::setBackEdgeA(ViewEdge *iBackEdgeA, bool incoming) if (!_sortedEdges.empty()) { edge_pointers_container::iterator dve = _sortedEdges.begin(), dveend = _sortedEdges.end(); for (; (dve != dveend) && ViewEdgeComp(**dve, _BackEdgeA); ++dve) { - ; + /* pass */ } _sortedEdges.insert(dve, &_BackEdgeA); } @@ -563,7 +563,7 @@ void NonTVertex::AddOutgoingViewEdge(ViewEdge *iVEdge) if (!_ViewEdges.empty()) { edges_container::iterator dve = _ViewEdges.begin(), dveend = _ViewEdges.end(); for (; (dve != dveend) && ViewEdgeComp(*dve, idve); ++dve) { - ; + /* pass */ } _ViewEdges.insert(dve, idve); } diff --git a/source/blender/modifiers/intern/MOD_weld.c b/source/blender/modifiers/intern/MOD_weld.c index f96ec9a82e5..bd567c52d88 100644 --- a/source/blender/modifiers/intern/MOD_weld.c +++ b/source/blender/modifiers/intern/MOD_weld.c @@ -46,6 +46,8 @@ #include "DEG_depsgraph.h" +#include "MOD_modifiertypes.h" + //#define USE_WELD_DEBUG //#define USE_WELD_NORMALS |