Cleanup: extra semicolons, comma use, undeclared vars
authorCampbell Barton <ideasman42@gmail.com>
Tue, 11 Feb 2020 01:01:29 +0000 (12:01 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 11 Feb 2020 01:04:50 +0000 (12:04 +1100)
intern/cycles/kernel/filter/filter_features_sse.h
intern/mantaflow/intern/MANTA_main.cpp
source/blender/blenkernel/intern/fluid.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenlib/intern/delaunay_2d.c
source/blender/draw/intern/draw_cache_impl_mesh.c
source/blender/freestyle/intern/view_map/ViewMap.cpp
source/blender/modifiers/intern/MOD_weld.c

index 7bbd17066fdbee818516ee9fef6288e4da181dba..59d4ace2bef97b9f8d548e0c4504df071831219e 100644 (file)
@@ -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)));
index 91853ca566bbd9b85a68ff3c240d470f959a5b96..d7c8f5491a96d9c0b76ce59e2fa29372c8280d11 100644 (file)
@@ -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';
 
index c3db083810ce6d0b11f15174e384c0ded36a9dc3..d38541c8bbe2f72eb4b9f1ae0cd0686cf6321dc0 100644 (file)
@@ -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;
index 4c4e88da6c744df6b32d2c39d15c594ac89b5335..2f6ffdfe60775e179c6a98a111aa67a2389a54a9 100644 (file)
@@ -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);
index 06c72a4c3d6859532cdb67c96e03f111fc766a15..7287bec0849deefdb89841fe76dbd51bac4a8f0b 100644 (file)
@@ -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;
index 7408c8d0e38574a4b47d27fd56e1487e8f6bef53..ed60e16c7cc4891b8c7bba8d4437bc4c17a71b60 100644 (file)
@@ -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;
index 9acd730d0622841204bd696ff00c2b337ea81d69..c371eba4b94c80a1dc0256f4c27c96e785aac022 100644 (file)
@@ -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);
   }
index f96ec9a82e595fe03358fb3d32ab370975dab686..bd567c52d88174918d6411b995458032f44d726e 100644 (file)
@@ -46,6 +46,8 @@
 
 #include "DEG_depsgraph.h"
 
+#include "MOD_modifiertypes.h"
+
 //#define USE_WELD_DEBUG
 //#define USE_WELD_NORMALS