[Bf-blender-cvs] [465250a] fluid-mantaflow: need to disable some smoke functions again

[Sebastián Barschkis]

Commit: 465250ad346cfc63050eb3f0b330b7b3509dc10a
Author: Sebastián Barschkis
Date:   Wed Jun 8 22:59:15 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB465250ad346cfc63050eb3f0b330b7b3509dc10a

need to disable some smoke functions again

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

M       source/blender/blenkernel/intern/pointcache.c
M       source/blender/blenkernel/intern/smoke.c

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

diff --git a/source/blender/blenkernel/intern/pointcache.c 
b/source/blender/blenkernel/intern/pointcache.c
index 4b0eb5b..817c07c 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -1597,8 +1597,9 @@ void BKE_ptcache_id_from_smoke(PTCacheID *pid, struct 
Object *ob, struct SmokeMo
        pid->read_point                         = NULL;
        pid->interpolate_point          = NULL;
 
-       pid->read_stream                        = ptcache_smoke_read;
-       pid->write_stream                       = ptcache_smoke_write;
+       // TODO (sebbas) need to disable this again for liquids
+       pid->read_stream                        = NULL; //ptcache_smoke_read;
+       pid->write_stream                       = NULL; //ptcache_smoke_write;
 
        pid->write_openvdb_stream       = ptcache_smoke_openvdb_write;
        pid->read_openvdb_stream        = ptcache_smoke_openvdb_read;
diff --git a/source/blender/blenkernel/intern/smoke.c 
b/source/blender/blenkernel/intern/smoke.c
index 15bfff5..95e829b 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -3018,7 +3018,8 @@ static void smokeModifier_process(SmokeModifierData *smd, 
Scene *scene, Object *
                        step(scene, ob, smd, dm, scene->r.frs_sec / 
scene->r.frs_sec_base);
                }
                // create shadows before writing cache so they get stored
-               smoke_calc_transparency(sds, scene);
+               // TODO (sebbas) disabled for liquid integration
+//             smoke_calc_transparency(sds, scene);
 
 #ifndef WITH_MANTA
                if (sds->wt)
@@ -3026,9 +3027,10 @@ static void smokeModifier_process(SmokeModifierData 
*smd, Scene *scene, Object *
                        smoke_turbulence_step(sds->wt, sds->fluid);
                }
 #endif
-               BKE_ptcache_validate(cache, framenr);
-               if (framenr != startframe)
-                       BKE_ptcache_write(&pid, framenr);
+               // TODO (sebbas) disabled for liquid integration
+//             BKE_ptcache_validate(cache, framenr);
+//             if (framenr != startframe)
+//                     BKE_ptcache_write(&pid, framenr);
 
 #ifdef DEBUG_TIME
                double end = PIL_check_seconds_timer();

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs