diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-26 20:29:14 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-26 20:29:14 +0400 |
commit | 3b5bcab09c28163f16d653a5b76dd3192c911007 (patch) | |
tree | 8127e7a5ce98641f27d0edd035922f3ddc9de1a3 /source/blender/modifiers | |
parent | f1996b5601e41602157035b1d91e8386761bd839 (diff) | |
parent | d52a811052c67686845dd1737d42fe65add51d55 (diff) |
svn merge ^/trunk/blender -r42139:42172
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r-- | source/blender/modifiers/intern/MOD_fluidsim_util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.c b/source/blender/modifiers/intern/MOD_fluidsim_util.c index 16de49a8c9d..c632b5beed8 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim_util.c +++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c @@ -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; |