Commit: ac0d74cb6d7a17c44cb602a5ff3faee5bb4c556e
Author: Sebastián Barschkis
Date:   Tue Mar 13 16:17:16 2018 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rBac0d74cb6d7a17c44cb602a5ff3faee5bb4c556e

cleanup in pointcache.c

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

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

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

diff --git a/source/blender/blenkernel/intern/pointcache.c 
b/source/blender/blenkernel/intern/pointcache.c
index 3c633ec85d7..704be7ff66d 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -1292,39 +1292,6 @@ static int ptcache_mesh_read(void *smoke_v, char 
*filename)
        return 0;
 }
 
-//static int ptcache_uni_read(void *smoke_v, char *filename, char *pathname, 
bool load_liquid_data)
-//{
-//     SmokeModifierData *smd = (SmokeModifierData *) smoke_v;
-//     int i;
-//
-//     if (!smd) {
-//             return 0;
-//     }
-//
-//     SmokeDomainSettings *sds = smd->domain;
-//     if (!(sds->flags & MOD_SMOKE_USE_VOLUME_CACHE)) {
-//             return 0;
-//     }
-//
-//     if (sds->fluid) {
-//             /* Mantaflow internal data loading */
-////           if (load_liquid_data) {
-////                   liquid_load_data(sds->fluid, pathname);
-////           }
-//
-//             /* Actual particle loading */
-//             liquid_update_particle_data(sds->fluid, filename);
-//
-//             i = strlen(filename);
-//             if (i > 4) filename[i-4] = '\0';        // strip .uni extension
-//             strcat(filename, "_pVel.uni");          // add particle 
extension
-//             liquid_update_particle_data(sds->fluid, filename);
-//
-//             return 1;
-//     }
-//     return 0;
-//}
-
 static int ptcache_mesh_write(void *smoke_v, char *filename)
 {
        SmokeModifierData *smd = (SmokeModifierData *) smoke_v;
@@ -1366,43 +1333,6 @@ static int ptcache_mesh_write(void *smoke_v, char 
*filename)
        return 0;
 }
 
-//static int ptcache_uni_write(void *smoke_v, char *filename, char* pathname, 
bool save_liquid_data)
-//{
-//     SmokeModifierData *smd = (SmokeModifierData *) smoke_v;
-//     int i;
-//     char filenameTmp[256];
-//
-//     if (!smd) {
-//             return 0;
-//     }
-//
-//     SmokeDomainSettings *sds = smd->domain;
-//     if (!(sds->flags & MOD_SMOKE_USE_VOLUME_CACHE)) {
-//             return 0;
-//     }
-//
-//     if (sds->fluid) {
-//             /* Mantaflow internal data saving */
-////           if (save_liquid_data) {
-////                   liquid_save_data(sds->fluid, pathname);
-////           }
-//
-//             /* Actual particle saving */
-//             liquid_save_particles(sds->fluid, filename);
-//
-//             strcpy(filenameTmp, filename);                  // copy name, 
original file name is needed later
-//             i = strlen(filenameTmp);
-//             if (i > 4) filenameTmp[i-4] = '\0';             // strip .uni 
extension
-//             strcat(filenameTmp, "_pVel.uni");               // add particle 
velocity extension
-//             liquid_save_particle_velocities(sds->fluid, filenameTmp);
-//
-//             /* Update particles for instant replay functionality */
-//             liquid_update_particle_data(sds->fluid, filename);
-//             liquid_update_particle_data(sds->fluid, filenameTmp);
-//             return 1;
-//     }
-//     return 0;
-//}
 #endif // WITH_MANTA
 
 #else // WITH_SMOKE

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

Reply via email to