[Bf-blender-cvs] [838dc349caa] master: Cleanup: const warning, unused var

[Campbell Barton]

Commit: 838dc349caa49ba65a1a5fb7bbb58f416fb933e6
Author: Campbell Barton
Date:   Thu Dec 19 00:19:01 2019 +1100
Branches: master
https://developer.blender.org/rB838dc349caa49ba65a1a5fb7bbb58f416fb933e6

Cleanup: const warning, unused var

===================================================================

M	source/blender/blenkernel/intern/particle_system.c
M	source/blender/blenlib/BLI_math_geom.h
M	source/blender/blenlib/intern/math_geom.c

===================================================================

diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 17195d8c6c3..34f2aa73817 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -4148,7 +4148,9 @@ static void particles_fluid_step(ParticleSimulationData *sim,
     psys->totpart = 0;
   }
 
-#ifdef WITH_FLUID
+#ifndef WITH_FLUID
+  UNUSED_VARS(use_render_params, cfra);
+#else
   {
     Object *ob = sim->ob;
     FluidModifierData *mmd = (FluidModifierData *)modifiers_findByType(ob, eModifierType_Fluid);
@@ -4400,9 +4402,7 @@ static void particles_fluid_step(ParticleSimulationData *sim,
 
     } /* Fluid sim particles done. */
   }
-#else
-  UNUSED_VARS(use_render_params);
-#endif  // WITH_FLUID
+#endif /* WITH_FLUID */
 }
 
 static int emit_particles(ParticleSimulationData *sim, PTCacheID *pid, float UNUSED(cfra))
diff --git a/source/blender/blenlib/BLI_math_geom.h b/source/blender/blenlib/BLI_math_geom.h
index 4f8810d50e1..534c25f6e01 100644
--- a/source/blender/blenlib/BLI_math_geom.h
+++ b/source/blender/blenlib/BLI_math_geom.h
@@ -645,7 +645,7 @@ void orthographic_m4(float mat[4][4],
                      const float farClip);
 void window_translate_m4(float winmat[4][4], float perspmat[4][4], const float x, const float y);
 
-void planes_from_projmat(float mat[4][4],
+void planes_from_projmat(const float mat[4][4],
                          float left[4],
                          float right[4],
                          float top[4],
diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c
index ba2a8605dec..a17fecca303 100644
--- a/source/blender/blenlib/intern/math_geom.c
+++ b/source/blender/blenlib/intern/math_geom.c
@@ -4711,7 +4711,7 @@ void window_translate_m4(float winmat[4][4], float perspmat[4][4], const float x
  *
  * plane parameters can be NULL if you do not need them.
  */
-void planes_from_projmat(float mat[4][4],
+void planes_from_projmat(const float mat[4][4],
                          float left[4],
                          float right[4],
                          float top[4],