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>2015-04-15 18:45:30 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-04-15 18:45:30 +0300
commit7f4b6a345e59bd4b05c8cab08d0c618eea9f827d (patch)
tree73e23b74e2a1dd679f443cee968dd43a484805cc /source/blender/blenkernel/intern/blender.c
parent99299da4b5ca1f9e9c347db120dc93df58e8d0a6 (diff)
Fix crash loading file without scene in bg mode
Diffstat (limited to 'source/blender/blenkernel/intern/blender.c')
-rw-r--r--source/blender/blenkernel/intern/blender.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index 305bf1ed796..4b2c6ef5e0e 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -263,7 +263,7 @@ static void setup_app_data(bContext *C, BlendFileData *bfd, const char *filepath
/* but use new Scene pointer */
curscene = bfd->curscene;
- track_undo_scene = (mode == LOAD_UNDO && curscreen && bfd->main->wm.first);
+ track_undo_scene = (mode == LOAD_UNDO && curscreen && curscene && bfd->main->wm.first);
if (curscene == NULL) curscene = bfd->main->scene.first;
/* empty file, we add a scene to make Blender work */