archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

bugfix [#22615] Opening a blend file in python (bpy.ops.wm.open_mainfile() (r29489)

Browse Source 
[#22557] bpy.ops.wm.read_homefile() causes segfault (r29372)
This commit is contained in:
Campbell Barton
2010-11-18 16:33:13 +00:00
parent 3ae670fc02
commit 23fbce5a5f
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
release/scripts/modules/bpy/ops.py
View File

@@ -153,21 +153,24 @@ class bpy_ops_submodule_op(object):
return self.module + "." + self.func
def __call__(self, *args, **kw):
import bpy
context = bpy.context
# Get the operator from blender
wm = context.window_manager
if args:
C_dict, C_exec = __class__._parse_args(args)
ret = op_call(self.idname_py(), C_dict, kw, C_exec)
else:
ret = op_call(self.idname_py(), None, kw)
if 'FINISHED' in ret:
import bpy
scene = bpy.context.scene
if scene: # None in backgroud mode
if 'FINISHED' in ret and context.window_manager == wm:
scene = context.scene
if scene: # None in backgroud mode
scene.update()
else:
for scene in bpy.data.scenes:
for scene in data.scenes:
scene.update()
return ret

11
source/blender/windowmanager/intern/wm_event_system.c
View File

@@ -438,7 +438,7 @@ static void wm_operator_reports(bContext *C, wmOperator *op, int retval, int pop
*/
static int wm_operator_register_check(wmWindowManager *wm, wmOperatorType *ot)
{
return (wm->op_undo_depth == 0) && (ot->flag & OPTYPE_REGISTER);
return wm && (wm->op_undo_depth == 0) && (ot->flag & OPTYPE_REGISTER);
}
static void wm_operator_finished(bContext *C, wmOperator *op, int repeat)
@@ -831,7 +831,6 @@ int WM_operator_name_call(bContext *C, const char *opstring, int context, Pointe
*/
int WM_operator_call_py(bContext *C, wmOperatorType *ot, int context, PointerRNA *properties, ReportList *reports)
{
wmWindowManager *wm= CTX_wm_manager(C);
int retval= OPERATOR_CANCELLED;
#if 0
@@ -855,7 +854,7 @@ int WM_operator_call_py(bContext *C, wmOperatorType *ot, int context, PointerRNA
/* keep the reports around if needed later */
if ( (retval & OPERATOR_RUNNING_MODAL) ||
((retval & OPERATOR_FINISHED) && wm_operator_register_check(wm, ot))
((retval & OPERATOR_FINISHED) && wm_operator_register_check(CTX_wm_manager(C), ot))
) {
reports->flag |= RPT_FREE; /* let blender manage freeing */
}
@@ -1722,7 +1721,11 @@ void wm_event_do_handlers(bContext *C)
}
action |= wm_handlers_do(C, event, &ar->handlers);
/* fileread case (python), [#29489] */
if(CTX_wm_window(C)==NULL)
return;
doit |= (BLI_in_rcti(&ar->winrct, event->x, event->y));
if(action & WM_HANDLER_BREAK)