[Bf-blender-cvs] [b57e38e9ab2] fluid-mantaflow: Merge branch 'master' into fluid-mantaflow
Sebastián Barschkis
noreply at git.blender.org
Sat Mar 11 15:50:46 CET 2017
Commit: b57e38e9ab23669b8593ffd30b38f83724236a59
Author: Sebastián Barschkis
Date: Fri Mar 10 23:04:26 2017 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rBb57e38e9ab23669b8593ffd30b38f83724236a59
Merge branch 'master' into fluid-mantaflow
===================================================================
===================================================================
diff --cc release/datafiles/locale
index 2b3c19f5f61,c93ed11a47b..507eacde960
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 2b3c19f5f61fc72dba56a7edfdc4e55e2327dc1f
-Subproject commit c93ed11a47b3016cf59711ec16de2e2e94c30e99
++Subproject commit 507eacde9608ce0190c6087fb338dd63f7a1649b
diff --cc release/scripts/addons
index a49ccb06276,371960484a3..b04ab01f947
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit a49ccb062769dcf8703d2590b485e8c3a9f8a01b
-Subproject commit 371960484a38fc64e0a2635170a41a0d8ab2f6bd
++Subproject commit b04ab01f947384013c459869f6026c75230e49f7
diff --cc release/scripts/addons_contrib
index a9198033ed1,a8515cfdfe9..1846e4a9d97
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit a9198033ed1e6f4a718b744107e73cb36f40ceb7
-Subproject commit a8515cfdfe9a98127b592f36fcbe51b7e23b969a
++Subproject commit 1846e4a9d97a9aef1563198b2d7544cb90ae4156
diff --cc release/scripts/startup/bl_ui/properties_physics_smoke.py
index 92de9d36a0a,ee9135b9dbf..aae74c5b9a6
--- a/release/scripts/startup/bl_ui/properties_physics_smoke.py
+++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py
@@@ -47,9 -45,12 +47,13 @@@ class PHYSICS_PT_smoke(PhysicButtonsPan
def draw(self, context):
layout = self.layout
+ if not bpy.app.build_options.mod_smoke:
+ layout.label("Built without Smoke modifier")
+ return
+
md = context.smoke
ob = context.object
+ scene = context.scene
layout.prop(md, "smoke_type", expand=True)
@@@ -480,5 -401,14 +484,13 @@@ class PHYSICS_PT_smoke_display_settings
col.prop(domain, "vector_draw_type")
col.prop(domain, "vector_scale")
+ layout.separator()
+ layout.label(text="Color Mapping:")
+ layout.prop(domain, "use_color_ramp")
+ col = layout.column();
+ col.enabled = domain.use_color_ramp
+ col.prop(domain, "coba_field")
+ col.template_color_ramp(domain, "color_ramp", expand=True)
+
-
if __name__ == "__main__": # only for live edit.
bpy.utils.register_module(__name__)
diff --cc source/blender/editors/space_view3d/drawvolume.c
index ce15bc05906,182dc214f8e..cb43c4d24a6
--- a/source/blender/editors/space_view3d/drawvolume.c
+++ b/source/blender/editors/space_view3d/drawvolume.c
@@@ -41,13 -41,10 +41,14 @@@
#include "BLI_math.h"
#include "BKE_DerivedMesh.h"
+ #include "BKE_texture.h"
#include "BKE_particle.h"
+#ifdef WITH_MANTA
+#include "manta_fluid_API.h"
+#else
#include "smoke_API.h"
+#endif
#include "BIF_gl.h"
diff --cc source/blender/makesdna/DNA_smoke_types.h
index 39486dcc8e1,c95e0a1f54a..383cde77d3e
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@@ -222,19 -210,17 +239,23 @@@ typedef struct SmokeDomainSettings
float slice_per_voxel;
float slice_depth;
float display_thickness;
+
+ struct ColorBand *coba;
float vector_scale;
char vector_draw_type;
- char pad2[3];
+ char use_coba;
+ char coba_field; /* simulation field used for the color mapping */
+ char pad2;
-} SmokeDomainSettings;
-
-/* inflow / outflow */
+ /* mantaflow settings */
+ struct FLUID *fluid;
+ float noise_pos_scale; /* noise settings */
+ float noise_time_anim;
+ int manta_solver_res; /* dimension of manta solver, 2d or 3d */
+ char manta_filepath[1024];
+ short type; /* gas, liquid */
+ short preconditioner; /* cg preconditioner */
+} SmokeDomainSettings;
/* type */
#define MOD_SMOKE_FLOW_TYPE_SMOKE 0
diff --cc source/blender/makesrna/intern/rna_smoke.c
index 85bc5b9267f,c12937bd2bf..aa058ff6563
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@@ -53,12 -54,10 +54,13 @@@
#include "BKE_context.h"
#include "BKE_depsgraph.h"
#include "BKE_particle.h"
+ #include "BKE_texture.h"
-#include "smoke_API.h"
-
+#ifndef WITH_MANTA
+ #include "smoke_API.h"
+#else
+ #include "manta_fluid_API.h"
+#endif
static void rna_Smoke_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
{
More information about the Bf-blender-cvs
mailing list