[Bf-blender-cvs] [d2dfaff2b69] fluid-mantaflow: Mantaflow: Cleaned up warnings

[Sebastián Barschkis]

Commit: d2dfaff2b69e74314bfedfdf2ec384dc59da5e1b
Author: Sebastián Barschkis
Date:   Sun Dec 15 22:26:00 2019 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rBd2dfaff2b69e74314bfedfdf2ec384dc59da5e1b

Mantaflow: Cleaned up warnings

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

M	source/blender/blenkernel/intern/manta.c
M	source/blender/makesrna/intern/rna_manta.c

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

diff --git a/source/blender/blenkernel/intern/manta.c b/source/blender/blenkernel/intern/manta.c
index ff07ed24454..2afc5d19a94 100644
--- a/source/blender/blenkernel/intern/manta.c
+++ b/source/blender/blenkernel/intern/manta.c
@@ -4167,8 +4167,8 @@ static void mantaModifier_processDomain(FluidModifierData *mmd,
   with_guiding = mds->flags & FLUID_DOMAIN_USE_GUIDING;
   with_particles = drops || bubble || floater;
 
-  bool has_config, has_data, has_noise, has_mesh, has_particles, has_guiding;
-  has_config = has_data = has_noise = has_mesh = has_particles = has_guiding = false;
+  bool has_data, has_noise, has_mesh, has_particles, has_guiding;
+  has_data = has_noise = has_mesh = has_particles = has_guiding = false;
 
   bool baking_data, baking_noise, baking_mesh, baking_particles, baking_guiding, bake_outdated;
   baking_data = mds->cache_flag & FLUID_DOMAIN_BAKING_DATA;
@@ -4240,6 +4240,7 @@ static void mantaModifier_processDomain(FluidModifierData *mmd,
       CLAMP(noise_frame, noise_frame, data_frame);
       CLAMP(mesh_frame, mesh_frame, data_frame);
       CLAMP(particles_frame, particles_frame, data_frame);
+      CLAMP(guiding_frame, guiding_frame, mds->cache_frame_end);
 
       /* Force to read cache as we're resuming the bake */
       read_cache = true;
diff --git a/source/blender/makesrna/intern/rna_manta.c b/source/blender/makesrna/intern/rna_manta.c
index 28a6d9ce3b5..814a4bdbb0b 100644
--- a/source/blender/makesrna/intern/rna_manta.c
+++ b/source/blender/makesrna/intern/rna_manta.c
@@ -109,9 +109,9 @@ static void rna_Manta_reset_dependency(Main *bmain, Scene *scene, PointerRNA *pt
 
 static void rna_Manta_parts_create(Main *bmain,
                                    PointerRNA *ptr,
-                                   char *pset_name,
-                                   char *parts_name,
-                                   char *psys_name,
+                                   const char *pset_name,
+                                   const char *parts_name,
+                                   const char *psys_name,
                                    int psys_type)
 {
   Object *ob = (Object *)ptr->owner_id;