[Bf-blender-cvs] [c179a13a4bc] fluid-mantaflow: Merge branch 'master' into fluid-mantaflow

[Sebastián Barschkis]

Commit: c179a13a4bc9568ffa35f6eb9d814195beeefb59
Author: Sebastián Barschkis
Date:   Wed Nov 27 11:17:58 2019 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rBc179a13a4bc9568ffa35f6eb9d814195beeefb59

Merge branch 'master' into fluid-mantaflow

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



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

diff --cc CMakeLists.txt
index a21c70eaa81,e6e0abe1ab8..6959f0e15ae
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -312,11 -312,9 +312,9 @@@ endif(
  
  
  # Modifiers
 -option(WITH_MOD_FLUID           "Enable Elbeem Modifier (Fluid Simulation)" ON)
 -option(WITH_MOD_SMOKE           "Enable Smoke Modifier (Smoke Simulation)" ON)
 +option(WITH_MOD_MANTA           "Enable Mantaflow Fluid Simulation Framework" ON)
 +option(WITH_MANTA_OMP           "Enable Mantaflow OpenMP support (instead of default TBB support)" OFF)
  option(WITH_MOD_REMESH          "Enable Remesh Modifier" ON)
- # option(WITH_MOD_CLOTH_ELTOPO    "Enable Experimental cloth solver" OFF)  # this is now only available in a branch
- # mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
  option(WITH_MOD_OCEANSIM        "Enable Ocean Modifier" OFF)
  
  # Image format support
diff --cc source/blender/makesdna/DNA_modifier_types.h
index 15f87328a50,a8db46238d8..a9086270f60
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@@ -439,14 -444,20 +444,20 @@@ enum 
    MOD_BEVEL_MITER_ARC,
  };
  
+ /* BevelModifier->vmesh_method */
+ enum {
+   MOD_BEVEL_VMESH_ADJ,
+   MOD_BEVEL_VMESH_CUTOFF,
+ };
+ 
 -typedef struct SmokeModifierData {
 +typedef struct MantaModifierData {
    ModifierData modifier;
  
 -  struct SmokeDomainSettings *domain;
 +  struct MantaDomainSettings *domain;
    /** Inflow, outflow, smoke objects. */
 -  struct SmokeFlowSettings *flow;
 -  /** Collision objects. */
 -  struct SmokeCollSettings *coll;
 +  struct MantaFlowSettings *flow;
 +  /** Effector objects (collision, guiding). */
 +  struct MantaCollSettings *effec;
    float time;
    /** Domain, inflow, outflow, .... */
    int type;
diff --cc source/blender/makesrna/intern/rna_modifier.c
index b814f20d8ce,789946d3268..c3747491d38
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@@ -432,10 -434,9 +433,9 @@@ const EnumPropertyItem rna_enum_axis_fl
  };
  
  #ifdef RNA_RUNTIME
- 
  #  include "DNA_particle_types.h"
  #  include "DNA_curve_types.h"
 -#  include "DNA_smoke_types.h"
 +#  include "DNA_manta_types.h"
  
  #  include "BKE_cachefile.h"
  #  include "BKE_context.h"
diff --cc waveletNoiseTile.bin
index 00000000000,00000000000..2cb64417574
new file mode 100644
Binary files differ