[Bf-blender-cvs] [d61d2107864] master: Fluid: Fix for GSoC display controls project

[Sebastián Barschkis]

Commit: d61d21078643da4a7258142d8e48e14c1325fb11
Author: Sebastián Barschkis
Date:   Wed Sep 9 16:51:32 2020 +0200
Branches: master
https://developer.blender.org/rBd61d21078643da4a7258142d8e48e14c1325fb11

Fluid: Fix for GSoC display controls project

Load all grids when the grid display option is turned on. Otherwise, the grid from the viewport display options might not have been loaded from the cache.

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

M	source/blender/blenkernel/intern/fluid.c

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

diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index 82ccd33a53b..e3063d1de75 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -3975,6 +3975,8 @@ static void BKE_fluid_modifier_processDomain(FluidModifierData *fmd,
   copy_v3_v3_int(o_shift, fds->shift);
 
   bool read_partial = false, read_all = false;
+  bool grid_display = fds->use_coba;
+
   /* Try to read from cache and keep track of read success. */
   if (read_cache) {
 
@@ -4038,7 +4040,8 @@ static void BKE_fluid_modifier_processDomain(FluidModifierData *fmd,
         }
       }
 
-      read_partial = !baking_data && !baking_particles && !baking_mesh && next_data;
+      read_partial = !baking_data && !baking_particles && !baking_mesh && next_data &&
+                     !grid_display;
       read_all = !read_partial && with_resumable_cache;
       has_data = manta_read_data(fds->fluid, fmd, data_frame, read_all);
     }