svn merge -r 15649:15800 https://svn.blender.org/svnroot/bf-blender/trunk/blender...

[blender-staging.git] / source / blender / blenloader / intern / writefile.c

diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 73abf362d12d9d0875c8660ac76f01f488fab08b..081aed2ef39668f39efade10381a9dac6fb38e20 100644 (file)
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -848,6 +848,11 @@ static void write_modifiers(WriteData *wd, ListBase *modbase)
                        writestruct(wd, DATA, "ClothCollSettings", 1, clmd->coll_parms);
                        writestruct(wd, DATA, "PointCache", 1, clmd->point_cache);
                } 
+               else if(md->type==eModifierType_Fluidsim) {
+                       FluidsimModifierData *fluidmd = (FluidsimModifierData*) md;
+                       
+                       writestruct(wd, DATA, "FluidsimSettings", 1, fluidmd->fss);
+               } 
                else if (md->type==eModifierType_Collision) {
                        
                        /*
@@ -913,7 +918,6 @@ static void write_objects(WriteData *wd, ListBase *idbase)
                        writestruct(wd, DATA, "PartDeflect", 1, ob->pd);
                        writestruct(wd, DATA, "SoftBody", 1, ob->soft);
                        if(ob->soft) writestruct(wd, DATA, "PointCache", 1, ob->soft->pointcache);
-                       writestruct(wd, DATA, "FluidsimSettings", 1, ob->fluidsimSettings); // NT
                        
                        write_particlesystems(wd, &ob->particlesystem);
                        write_modifiers(wd, &ob->modifiers);