svn merge ^/trunk/blender -r42139:42172

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);