diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-10-24 11:56:42 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-24 11:56:42 +0400 |
commit | ad1d3dd30fa5f4c33279679e3824899fd18801b8 (patch) | |
tree | cef4de1e42c5a8a2a1f68719452891c19a065ab7 /source/creator | |
parent | 77a7ec7c61965efa9e2e82894c821fe5c937b989 (diff) | |
parent | 1bdf652b89871614c38bf2146cf94522c3347e06 (diff) |
svn merge ^/trunk/blender -r41175:41200 --- will need to apply fix after
Diffstat (limited to 'source/creator')
-rw-r--r-- | source/creator/creator.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/source/creator/creator.c b/source/creator/creator.c index d24e930e2c9..7c27208d821 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -64,6 +64,7 @@ #include "DNA_ID.h" #include "DNA_scene_types.h" +#include "DNA_userdef_types.h" #include "BLI_blenlib.h" @@ -87,6 +88,7 @@ #include "BPY_extern.h" #endif +#include "RE_engine.h" #include "RE_pipeline.h" //XXX #include "playanim_ext.h" @@ -145,10 +147,6 @@ static int print_version(int argc, const char **argv, void *data); extern int pluginapi_force_ref(void); /* from blenpluginapi:pluginapi.c */ -char bprogname[FILE_MAX]; -char bprogdir[FILE_MAX]; -char btempdir[FILE_MAX]; - #define BLEND_VERSION_STRING_FMT "Blender %d.%02d (sub %d)\n", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION /* Initialize callbacks for the modules that need them */ @@ -1184,11 +1182,8 @@ int main(int argc, const char **argv) fpsetmask(0); #endif - // copy path to executable in bprogname. playanim and creting runtimes - // need this. - - BLI_where_am_i(bprogname, sizeof(bprogname), argv[0]); - BLI_split_dir_part(bprogname, bprogdir, sizeof(bprogdir)); + // initialize path to executable + BLI_init_program_path(argv[0]); BLI_threadapi_init(); @@ -1248,7 +1243,8 @@ int main(int argc, const char **argv) WM_init(C, argc, argv); /* this is properly initialized with user defs, but this is default */ - BLI_where_is_temp(btempdir, FILE_MAX, 1); /* call after loading the startup.blend so we can read U.tempdir */ + /* call after loading the startup.blend so we can read U.tempdir */ + BLI_init_temporary_dir(U.tempdir); #ifdef WITH_SDL BLI_setenv("SDL_VIDEODRIVER", "dummy"); @@ -1259,7 +1255,8 @@ int main(int argc, const char **argv) WM_init(C, argc, argv); - BLI_where_is_temp(btempdir, FILE_MAX, 0); /* call after loading the startup.blend so we can read U.tempdir */ + /* don't use user preferences temp dir */ + BLI_init_temporary_dir(NULL); } #ifdef WITH_PYTHON /** |