[Bf-blender-cvs] [e3f4037] master: Fix T38715: Setting object mode fails from command line

[Campbell Barton]

Commit: e3f4037075718f1a6fe288f15f0f37fc8d3dcc2b
Author: Campbell Barton
Date:   Wed Feb 19 14:04:35 2014 +1100
https://developer.blender.org/rBe3f4037075718f1a6fe288f15f0f37fc8d3dcc2b

Fix T38715: Setting object mode fails from command line

also run load pre/post callbacks

===================================================================

M       source/creator/creator.c

===================================================================

diff --git a/source/creator/creator.c b/source/creator/creator.c
index dbb7bef..4aaa2ae 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -111,6 +111,7 @@
 #include "RE_pipeline.h"
 
 #include "ED_datafiles.h"
+#include "ED_util.h"
 
 #include "WM_api.h"
 
@@ -1253,7 +1254,11 @@ static int load_file(int UNUSED(argc), const char 
**argv, void *data)
        BLI_path_cwd(filename);
 
        if (G.background) {
-               int retval = BKE_read_file(C, filename, NULL);
+               int retval;
+
+               BLI_callback_exec(CTX_data_main(C), NULL, BLI_CB_EVT_LOAD_PRE);
+
+               retval = BKE_read_file(C, filename, NULL);
 
                /* we successfully loaded a blend file, get sure that
                 * pointcache works */
@@ -1266,7 +1271,7 @@ static int load_file(int UNUSED(argc), const char **argv, 
void *data)
                                extern void wm_add_default(bContext *C);
 
                                /* wm_add_default() needs the screen to be set. 
*/
-                               CTX_wm_screen_set(C, 
CTX_data_main(C)->screen.first);
+                               CTX_wm_screen_set(C, bmain->screen.first);
                                wm_add_default(C);
                        }
 
@@ -1275,6 +1280,8 @@ static int load_file(int UNUSED(argc), const char **argv, 
void *data)
                        G.relbase_valid = 1;
                        if (CTX_wm_manager(C) == NULL) CTX_wm_manager_set(C, 
wm);  /* reset wm */
 
+                       /* WM_file_read would call normally */
+                       ED_editors_init(C);
                        DAG_on_visible_update(bmain, TRUE);
                        BKE_scene_update_tagged(bmain->eval_ctx, bmain, 
CTX_data_scene(C));
                }
@@ -1289,6 +1296,8 @@ static int load_file(int UNUSED(argc), const char **argv, 
void *data)
                BPY_python_reset(C);
 #endif
 
+               BLI_callback_exec(CTX_data_main(C), NULL, BLI_CB_EVT_LOAD_POST);
+
                /* happens for the UI on file reading too (huh? (ton))*/
                // XXX          BKE_reset_undo();
                //                      BKE_write_undo("original");     /* save 
current state */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs