Mantaflow [Part 6]: Updates in /blender/source

A collection of smaller changes that are required in the /blender/source files. A lot of them are also due to variable renaming.

Reviewed By: sergey

Maniphest Tasks: T59995

Differential Revision: https://developer.blender.org/D3855

source/blender/python/intern/bpy_app_build_options.c

@@ -51,16 +51,15 @@ static PyStructSequence_Field app_builtopts_info_fields[] = {
     {(char *)"sdl_dynload", NULL},
     {(char *)"jack", NULL},
     {(char *)"libmv", NULL},
-    {(char *)"mod_fluid", NULL},
     {(char *)"mod_oceansim", NULL},
     {(char *)"mod_remesh", NULL},
-    {(char *)"mod_smoke", NULL},
     {(char *)"collada", NULL},
     {(char *)"opencolorio", NULL},
     {(char *)"openmp", NULL},
     {(char *)"openvdb", NULL},
     {(char *)"alembic", NULL},
     {(char *)"usd", NULL},
+    {(char *)"fluid", NULL},
     {NULL},
 };
 
@@ -222,12 +221,6 @@ static PyObject *make_builtopts_info(void)
   SetObjIncref(Py_False);
 #endif
 
-#ifdef WITH_MOD_FLUID
-  SetObjIncref(Py_True);
-#else
-  SetObjIncref(Py_False);
-#endif
-
 #ifdef WITH_OCEANSIM
   SetObjIncref(Py_True);
 #else
@@ -240,12 +233,6 @@ static PyObject *make_builtopts_info(void)
   SetObjIncref(Py_False);
 #endif
 
-#ifdef WITH_SMOKE
-  SetObjIncref(Py_True);
-#else
-  SetObjIncref(Py_False);
-#endif
-
 #ifdef WITH_COLLADA
   SetObjIncref(Py_True);
 #else
@@ -282,6 +269,12 @@ static PyObject *make_builtopts_info(void)
   SetObjIncref(Py_False);
 #endif
 
+#ifdef WITH_FLUID
+  SetObjIncref(Py_True);
+#else
+  SetObjIncref(Py_False);
+#endif
+
 #undef SetObjIncref
 
   return builtopts_info;