diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2010-01-13 10:26:11 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2010-01-13 10:26:11 +0300 |
| commit | 219b472920998d763916c165816191bd8ae1f4a1 (patch) | |
| tree | d942c83359abf7cb1f0362afbbd543e3f72e38ee /source/creator | |
| parent | ed12e1978fec2eed33439f5e342cd84ef443d04e (diff) | |
| parent | 3b1585b1722efcf06ef9aa8f9d673047e68a7b9d (diff) | |
merge with trunk/2.5 at r25907
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/SConscript | 1 | ||||
| -rw-r--r-- | source/creator/creator.c | 17 |
2 files changed, 4 insertions, 14 deletions
diff --git a/source/creator/SConscript b/source/creator/SConscript index 6c95f25a0b2..8c71e0e8566 100644 --- a/source/creator/SConscript +++ b/source/creator/SConscript @@ -38,5 +38,6 @@ if env['WITH_BF_FHS']: # /usr -> /usr/share/blender/2.5 if env['BF_BUILDINFO']: defs.append('BUILD_DATE') + defs.append('NAN_BUILDINFO') env.BlenderLib ( libname = 'bf_creator', sources = Split(sources), includes = Split(incs), defines = defs, libtype='core', priority = 0 ) diff --git a/source/creator/creator.c b/source/creator/creator.c index 41ecd90916d..19cc1f8302d 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -519,14 +519,8 @@ int main(int argc, char **argv) } } - WM_init(C); - -#ifndef DISABLE_PYTHON - BPY_set_context(C); /* necessary evil */ - BPY_start_python(argc, argv); - BPY_load_user_modules(C); -#endif - + WM_init(C, argc, argv); + // XXX BRECHT SOLVE BLI_where_is_temp( btempdir, 1 ); /* call after loading the .B.blend so we can read U.tempdir */ @@ -565,13 +559,8 @@ int main(int argc, char **argv) } } - WM_init(C); + WM_init(C, argc, argv); -#ifndef DISABLE_PYTHON - BPY_set_context(C); /* necessary evil */ - BPY_start_python(argc, argv); - BPY_load_user_modules(C); -#endif BLI_where_is_temp( btempdir, 0 ); /* call after loading the .B.blend so we can read U.tempdir */ } #ifndef DISABLE_PYTHON |