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/creator | |
parent | f1996b5601e41602157035b1d91e8386761bd839 (diff) | |
parent | d52a811052c67686845dd1737d42fe65add51d55 (diff) |
svn merge ^/trunk/blender -r42139:42172
Diffstat (limited to 'source/creator')
-rw-r--r-- | source/creator/creator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/creator/creator.c b/source/creator/creator.c index ff5f6fc26cc..c1de6868f7b 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -893,7 +893,7 @@ static int run_python(int argc, const char **argv, void *data) /* workaround for scripts not getting a bpy.context.scene, causes internal errors elsewhere */ if (argc > 1) { /* Make the path absolute because its needed for relative linked blends to be found */ - char filename[FILE_MAXDIR + FILE_MAXFILE]; + char filename[FILE_MAX]; BLI_strncpy(filename, argv[1], sizeof(filename)); BLI_path_cwd(filename); @@ -954,7 +954,7 @@ static int load_file(int UNUSED(argc), const char **argv, void *data) bContext *C = data; /* Make the path absolute because its needed for relative linked blends to be found */ - char filename[FILE_MAXDIR + FILE_MAXFILE]; + char filename[FILE_MAX]; BLI_strncpy(filename, argv[0], sizeof(filename)); BLI_path_cwd(filename); |