[Bf-blender-cvs] [d670a1c504d] soc-2020-fluid-tools: Merge branch 'master' into soc-2020-fluid-tools

[Sriharsha Kotcharlakot]

Commit: d670a1c504dd51cbbd0cd8712541fdf2fafec67f
Author: Sriharsha Kotcharlakot
Date:   Wed Jun 24 23:19:22 2020 +0530
Branches: soc-2020-fluid-tools
https://developer.blender.org/rBd670a1c504dd51cbbd0cd8712541fdf2fafec67f

Merge branch 'master' into soc-2020-fluid-tools

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



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

diff --cc source/blender/makesdna/DNA_fluid_types.h
index ccb5215191f,263cd3f7887..207351e8c19
--- a/source/blender/makesdna/DNA_fluid_types.h
+++ b/source/blender/makesdna/DNA_fluid_types.h
@@@ -597,8 -612,13 +619,14 @@@ typedef struct FluidDomainSettings 
    char use_coba;
    char coba_field; /* Simulation field used for the color mapping. */
    char interp_method;
 +  char _pad9[4]; /* Unused. */
  
+   /* OpenVDB cache options. */
+   int openvdb_compression;
+   float clipping;
+   char openvdb_data_depth;
+   char _pad9[7]; /* Unused. */
+ 
    /* -- Deprecated / unsed options (below). -- */
  
    /* View options. */