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

Python/context: python could get invalid bpy.data in scene update handler after

Browse Source 
undo.

The way this got updated from the context is a bit unreliable, and for handlers
the update couldn't happen because there is no context passed in. Now it's
updated from setup_app_data, which is where the change actually happens. I left
in the other updates to be sure but they should not be needed anymore.
This commit is contained in:
Brecht Van Lommel
2012-05-08 22:07:06 +00:00
parent f6abd6ee40
commit d9ce1cda94
5 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/python/intern/bpy_interface.c
View File

@@ -96,7 +96,7 @@ static double bpy_timer_run_tot; /* accumulate python runs */
#endif
/* use for updating while a python script runs - in case of file load */
void bpy_context_update(bContext *C)
void BPY_context_update(bContext *C)
{
/* don't do this from a non-main (e.g. render) thread, it can cause a race
* condition on C->data.recursion. ideal solution would be to disable
@@ -117,7 +117,7 @@ void bpy_context_set(bContext *C, PyGILState_STATE *gilstate)
*gilstate = PyGILState_Ensure();
if (py_call_level == 1) {
bpy_context_update(C);
BPY_context_update(C);
#ifdef TIME_PY_RUN
if (bpy_timer_count == 0) {
@@ -178,7 +178,8 @@ void BPY_modules_update(bContext *C)
/* refreshes the main struct */
BPY_update_rna_module();
bpy_context_module->ptr.data = (void *)C;
if(bpy_context_module)
bpy_context_module->ptr.data = (void *)C;
}
void BPY_context_set(bContext *C)
@@ -623,7 +624,7 @@ void BPY_modules_load_user(bContext *C)
/* update pointers since this can run from a nested script
* on file load */
if (py_call_level) {
bpy_context_update(C);
BPY_context_update(C);
}
bpy_context_set(C, &gilstate);