diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index 31a1d408599..98aa8c9be35 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -6242,7 +6242,7 @@ static int bpy_class_call(bContext *C, PointerRNA *ptr, FunctionRNA *func, Param /* annoying!, need to check if the screen gets set to NULL which is a * hint that the file was actually re-loaded. */ - const char is_valid_wm= (CTX_wm_manager(C) != NULL); + char is_valid_wm; PropertyRNA *pret_single= NULL; void *retdata_single= NULL; @@ -6269,6 +6269,8 @@ static int bpy_class_call(bContext *C, PointerRNA *ptr, FunctionRNA *func, Param if(C==NULL) C= BPy_GetContext(); + is_valid_wm= (CTX_wm_manager(C) != NULL); + bpy_context_set(C, &gilstate); if (!is_static) { @@ -6505,7 +6507,7 @@ static int bpy_class_call(bContext *C, PointerRNA *ptr, FunctionRNA *func, Param if ( (!is_static) && (ptr->data) && (RNA_struct_is_a(ptr->type, &RNA_Operator)) && - is_valid_wm == (CTX_wm_manager(C) != NULL)) + (is_valid_wm == (CTX_wm_manager(C) != NULL))) { wmOperator *op= ptr->data; reports= op->reports;