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>2010-01-10 23:01:13 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-01-10 23:01:13 +0300
commitb36a05bb7e794335e3415594c41d3986cdc815e8 (patch)
treef6a3e9f13a6941b764d01d0c6b1e40df8198c6ea /source/blender/python
parent0bd98195a1d67ce741145a39147cf8272708f5a2 (diff)
- fix for crash if drivers were used in the .B.blend
- fix for problem where proxy objects could enter editmode but not exit
Diffstat (limited to 'source/blender/python')
-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 2fcb36f6d5b..2c1edc965e9 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -698,8 +698,13 @@ int BPY_button_eval(bContext *C, char *expr, double *value)
void BPY_load_user_modules(bContext *C)
{
PyGILState_STATE gilstate;
+ Main *bmain= CTX_data_main(C);
Text *text;
+ /* can happen on file load */
+ if(bmain==NULL)
+ return;
+
bpy_context_set(C, &gilstate);
for(text=CTX_data_main(C)->text.first; text; text= text->id.next) {