[Bf-blender-cvs] [2c991e2] fluid-mantaflow: re-enabled the remaining smoke functions. smoke sim now back to normal state

[Sebastián Barschkis]

Commit: 2c991e2ff2599432705980c09be1b423ea2b72c4
Author: Sebastián Barschkis
Date:   Wed Jun 8 16:19:33 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB2c991e2ff2599432705980c09be1b423ea2b72c4

re-enabled the remaining smoke functions. smoke sim now back to normal state

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

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 fa6a929..4b0eb5b 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -1597,9 +1597,8 @@ void BKE_ptcache_id_from_smoke(PTCacheID *pid, struct 
Object *ob, struct SmokeMo
        pid->read_point                         = NULL;
        pid->interpolate_point          = NULL;
 
-//             TODO Disabled while integrating liquids
-       pid->read_stream                        = NULL; //ptcache_smoke_read;
-       pid->write_stream                       = NULL; //ptcache_smoke_write;
+       pid->read_stream                        = ptcache_smoke_read;
+       pid->write_stream                       = 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 63e3587..15bfff5 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -3018,8 +3018,7 @@ 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
-//             TODO Disabled while integrating liquids
-//             smoke_calc_transparency(sds, scene);
+               smoke_calc_transparency(sds, scene);
 
 #ifndef WITH_MANTA
                if (sds->wt)
@@ -3027,10 +3026,9 @@ static void smokeModifier_process(SmokeModifierData 
*smd, Scene *scene, Object *
                        smoke_turbulence_step(sds->wt, sds->fluid);
                }
 #endif
-//             TODO Disabled while integrating liquids
-//             BKE_ptcache_validate(cache, framenr);
-//             if (framenr != startframe)
-//                     BKE_ptcache_write(&pid, framenr);
+               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