[Bf-blender-cvs] [9a3b3700615] functions: Merge branch 'master' into functions

[Jacques Lucke]

Commit: 9a3b3700615e21fd84ec4204962f010e14b2fc43
Author: Jacques Lucke
Date:   Tue Dec 17 09:34:13 2019 +0100
Branches: functions
https://developer.blender.org/rB9a3b3700615e21fd84ec4204962f010e14b2fc43

Merge branch 'master' into functions

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



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

diff --cc release/scripts/startup/bl_operators/__init__.py
index 8a9c5f01e5f,5af2bd22222..d72557fc3d6
--- a/release/scripts/startup/bl_operators/__init__.py
+++ b/release/scripts/startup/bl_operators/__init__.py
@@@ -32,9 -32,7 +32,8 @@@ _modules = 
      "constraint",
      "file",
      "image",
-     "mask",
      "mesh",
 +    "modifiers",
      "node",
      "object",
      "object_align",
diff --cc source/blender/makesdna/DNA_modifier_types.h
index 44bf275d422,0cc80a0112d..52e12dc4057
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@@ -87,10 -89,7 +89,11 @@@ typedef enum ModifierType 
    eModifierType_SurfaceDeform = 53,
    eModifierType_WeightedNormal = 54,
    eModifierType_Weld = 55,
-   eModifierType_FunctionPoints = 56,
+   eModifierType_Fluid = 56,
 +  eModifierType_BParticles = 57,
 +  eModifierType_BParticlesOutput = 58,
 +  eModifierType_FunctionDeform = 59,
++  eModifierType_FunctionPoints = 58,
    NUM_MODIFIER_TYPES,
  } ModifierType;
  
diff --cc source/blender/makesrna/intern/rna_modifier.c
index 7c9ac6a2072,589ce1414bb..1896c9dbec3
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@@ -289,11 -286,9 +288,11 @@@ const EnumPropertyItem rna_enum_object_
       ICON_MOD_PARTICLES,
       "Particle System",
       "Spawn particles from the shape"},
-     {eModifierType_Smoke, "SMOKE", ICON_MOD_SMOKE, "Smoke", ""},
+     {eModifierType_Fluid, "FLUID", ICON_MOD_FLUIDSIM, "Fluid Simulation", ""},
      {eModifierType_Softbody, "SOFT_BODY", ICON_MOD_SOFT, "Soft Body", ""},
      {eModifierType_Surface, "SURFACE", ICON_MODIFIER, "Surface", ""},
 +    {eModifierType_BParticles, "BPARTICLES", ICON_NONE, "BParticles", ""},
 +    {eModifierType_BParticlesOutput, "BPARTICLES_OUTPUT", ICON_NONE, "BParticles Output", ""},
      {0, NULL, 0, NULL, NULL},
  };
  
@@@ -723,15 -716,8 +720,16 @@@ static StructRNA *rna_Modifier_refine(s
        return &RNA_SurfaceDeformModifier;
      case eModifierType_WeightedNormal:
        return &RNA_WeightedNormalModifier;
 +    case eModifierType_FunctionDeform:
 +      return &RNA_FunctionDeformModifier;
 +    case eModifierType_FunctionPoints:
 +      return &RNA_FunctionPointsModifier;
 +    case eModifierType_BParticles:
 +      return &RNA_BParticlesModifier;
 +    case eModifierType_BParticlesOutput:
 +      return &RNA_BParticlesOutputModifier;
      /* Default */
+     case eModifierType_Fluidsim: /* deprecated */
      case eModifierType_None:
      case eModifierType_ShapeKey:
      case NUM_MODIFIER_TYPES:
diff --cc source/blender/modifiers/CMakeLists.txt
index e0232431930,cec7ddb4b68..ffc7425adaa
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@@ -59,12 -54,7 +58,11 @@@ set(SR
    intern/MOD_dynamicpaint.c
    intern/MOD_edgesplit.c
    intern/MOD_explode.c
-   intern/MOD_fluidsim.c
-   intern/MOD_fluidsim_util.c
+   intern/MOD_fluid.c
 +  intern/MOD_functiondeform_cxx.cc
 +  intern/MOD_functiondeform.c
 +  intern/MOD_functionpoints_cxx.cc
 +  intern/MOD_functionpoints.c
    intern/MOD_hook.c
    intern/MOD_laplaciandeform.c
    intern/MOD_laplaciansmooth.c