diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-01-05 13:31:27 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-01-05 13:31:27 +0300 |
| commit | 776b2451e10963a07bf37e979d3c4b6e24a132f7 (patch) | |
| tree | 5d38c71fe177e993a937be85411a7655312540b3 /source/blender/blenkernel/intern/blender.c | |
| parent | 5b0815ca8e23be1b82a8b0139549395485c0398b (diff) | |
Bugfix #2095
When loading a file with linked external scene, and that external scene
didnt exist anymore, and that scene was active in the file -> crash!
Render code; changed to use local 'puno' flag for threaded render.
Diffstat (limited to 'source/blender/blenkernel/intern/blender.c')
| -rw-r--r-- | source/blender/blenkernel/intern/blender.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index db8653f0abe..9e8ac8ca8ea 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -325,6 +325,11 @@ static void setup_app_data(BlendFileData *bfd, char *filename) G.curscreen= bfd->curscreen; G.scene= G.curscreen->scene; } + /* this can happen when active scene was lib-linked, and doesnt exist anymore */ + if(G.scene==NULL) { + G.scene= G.main->scene.first; + G.curscreen->scene= G.scene; + } /* special cases, override loaded flags: */ if (G.f & G_DEBUG) bfd->globalf |= G_DEBUG; |