Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-10-01 18:14:21 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-10-01 18:14:21 +0400
commitb04b8fd0e85f0504bd726e52a5f94413e61012c7 (patch)
treee752cafb0d4f1b5e05f744d68af16d3496ab532e /source/blender/python/intern/bpy_interface.c
parent77b90a94c978bd58e1a236b75745152b7b03f682 (diff)
fix for crash found when attempting to setup testing environment to find crashes :)
scripts that have `Register` enabled and load another blend file would crash blender.
Diffstat (limited to 'source/blender/python/intern/bpy_interface.c')
-rw-r--r--source/blender/python/intern/bpy_interface.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 85f6163c721..d5ef6905b51 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -678,6 +678,11 @@ void BPY_modules_load_user(bContext *C)
else {
Py_DECREF(module);
}
+
+ /* check if the script loaded a new file */
+ if (bmain != CTX_data_main(C)) {
+ break;
+ }
}
}
}