Merged changes in the trunk up to revision 42116.
[blender.git] / source / blender / modifiers / intern / MOD_fluidsim_util.c
index 34c8c4cc1b1e4c691c86bf0f156e092ff2a7042f..8696bd12502c503a83fb69394a0a63270516677e 100644 (file)
@@ -102,7 +102,7 @@ void fluidsim_init(FluidsimModifierData *fluidmd)
                // fluid/inflow settings
                // fss->iniVel --> automatically set to 0
 
-               modifier_path_init(fss->surfdataPath, sizeof(fss->surfdataPath), "fluid_cache");
+               modifier_path_init(fss->surfdataPath, sizeof(fss->surfdataPath), "cache_fluid");
 
                // first init of bounding box
                // no bounding box needed
@@ -447,7 +447,7 @@ static DerivedMesh *fluidsim_read_cache(Object *ob, DerivedMesh *orgdm, Fluidsim
 {
        int displaymode = 0;
        int curFrame = framenr - 1 /*scene->r.sfra*/; /* start with 0 at start frame */
-       char targetFile[FILE_MAXFILE+FILE_MAXDIR];
+       char targetFile[FILE_MAX];
        FluidsimSettings *fss = fluidmd->fss;
        DerivedMesh *dm = NULL;
        MFace *mface;