Commit: 80f4b470a58bf7925b6ecd1a17e7fdc32f41c61d
Author: Sebastián Barschkis
Date: Mon Jun 20 01:05:43 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB80f4b470a58bf7925b6ecd1a17e7fdc32f41c61d
cleanup: removed old manta obj approach - we're using phi grid for liquid inflow
===================================================================
M source/blender/blenkernel/intern/smoke.c
M source/blender/makesdna/DNA_smoke_types.h
===================================================================
diff --git a/source/blender/blenkernel/intern/smoke.c
b/source/blender/blenkernel/intern/smoke.c
index b95b49f..9b2bcf1 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -3128,7 +3128,6 @@ static void smokeModifier_process(SmokeModifierData *smd,
Scene *scene, Object *
else if (smd->type & MOD_SMOKE_TYPE_DOMAIN)
{
SmokeDomainSettings *sds = smd->domain;
- sds->manta_obj = ob;
PointCache *cache = NULL;
PTCacheID pid;
int startframe, endframe, framenr;
diff --git a/source/blender/makesdna/DNA_smoke_types.h
b/source/blender/makesdna/DNA_smoke_types.h
index 40917e4..6b88c33 100644
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@ -175,7 +175,6 @@ typedef struct SmokeDomainSettings {
/* mantaflow settings */
struct SMOKE *fluid;
- struct Object *manta_obj;
float noise_pos_scale; /* noise settings */
float noise_time_anim;
int manta_solver_res; /* dimension of manta solver, 2d or 3d */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
