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

[Sebastián Barschkis]

Commit: 75eb9b93b3439316e4b1c1141df0bce28fdce3aa
Author: Sebastián Barschkis
Date:   Sun Dec 15 22:36:01 2019 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rB75eb9b93b3439316e4b1c1141df0bce28fdce3aa

Merge branch 'master' into fluid-mantaflow

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



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

diff --cc source/blender/python/intern/bpy_app_build_options.c
index a7ffda9a689,ee6a3fd41d8..d6e21992912
--- a/source/blender/python/intern/bpy_app_build_options.c
+++ b/source/blender/python/intern/bpy_app_build_options.c
@@@ -58,7 -60,7 +58,11 @@@ static PyStructSequence_Field app_built
      {(char *)"openmp", NULL},
      {(char *)"openvdb", NULL},
      {(char *)"alembic", NULL},
++<<<<<<< HEAD
 +    {(char *)"fluid", NULL},
++=======
+     {(char *)"usd", NULL},
++>>>>>>> master
      {NULL},
  };
  
@@@ -262,12 -276,12 +266,18 @@@ static PyObject *make_builtopts_info(vo
    SetObjIncref(Py_False);
  #endif
  
+ #ifdef WITH_USD
+   SetObjIncref(Py_True);
+ #else
+   SetObjIncref(Py_False);
+ #endif
+ 
 +#ifdef WITH_MANTA
 +  SetObjIncref(Py_True);
 +#else
 +  SetObjIncref(Py_False);
 +#endif
 +
  #undef SetObjIncref
  
    return builtopts_info;