diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-08-06 08:55:32 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-08-06 08:55:32 +0400 |
| commit | 893afe0e84abede39bb7e639b49143b88303b969 (patch) | |
| tree | ce92d26913ade1ec028bb560d1f694f6178c62d6 /source/blender/editors/util | |
| parent | 7d84048df64c0532de3ddf2d08174b502e263b72 (diff) | |
| parent | 99c64e05a6a7cdd8b2e5bf88706165ebdb5101d1 (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30887:31091
Diffstat (limited to 'source/blender/editors/util')
| -rw-r--r-- | source/blender/editors/util/ed_util.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c index fbf2051f962..3491c1b4df2 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -77,13 +77,17 @@ void ED_editors_init(bContext *C) /* frees all editmode stuff */ void ED_editors_exit(bContext *C) { + Main *bmain= CTX_data_main(C); Scene *sce; + + if(!bmain) + return; /* frees all editmode undos */ undo_editmode_clear(); ED_undo_paint_free(); - for(sce=G.main->scene.first; sce; sce= sce->id.next) { + for(sce=bmain->scene.first; sce; sce= sce->id.next) { if(sce->obedit) { Object *ob= sce->obedit; |