diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-04-18 06:03:19 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-04-18 06:03:19 +0400 |
commit | dfe2f8dc03267e041102837e92f547fb04881510 (patch) | |
tree | d9582c4667ce5b9e39e2adce40832aa4f44b4fe7 /source/creator/creator.c | |
parent | d7e08f2d33207fdf76b1b597ef0de9dec26e3987 (diff) | |
parent | 00e46ef739cf2bfddb8805af056aa59fd3b3c71c (diff) |
Merged changes in the trunk up to revision 28247.
Diffstat (limited to 'source/creator/creator.c')
-rw-r--r-- | source/creator/creator.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/creator/creator.c b/source/creator/creator.c index b4158483cef..9569816e125 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -50,6 +50,7 @@ #endif #include "BLI_args.h" +#include "BLI_threads.h" #include "GEN_messaging.h" @@ -840,9 +841,11 @@ static int load_file(int argc, char **argv, void *data) /*we successfully loaded a blend file, get sure that pointcache works */ if (retval!=0) { + wmWindowManager *wm= CTX_wm_manager(C); CTX_wm_manager_set(C, NULL); /* remove wm to force check */ WM_check(C); G.relbase_valid = 1; + if (CTX_wm_manager(C) == NULL) CTX_wm_manager_set(C, wm); /* reset wm */ } /* happens for the UI on file reading too (huh? (ton))*/ @@ -964,6 +967,8 @@ int main(int argc, char **argv) strip_quotes(build_type); #endif + BLI_threadapi_init(); + RNA_init(); RE_engines_init(); |