diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-07-06 11:34:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-06 11:34:38 +0400 |
| commit | ae754c6384e212678b5d41bd0b8ddf38b31a3f07 (patch) | |
| tree | ad0ffab6ae87fc150b905498d73fe663bfbcd336 /source/blender/render | |
| parent | 152e1bed456385c5b12aab37a48fa8d4153377b1 (diff) | |
fix for crash deleting the world when viewport preview is used.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index adb8956bfa3..6e70b4bcfc9 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -4903,13 +4903,13 @@ void RE_Database_Free(Render *re) if (re->wrld.aosphere) { MEM_freeN(re->wrld.aosphere); re->wrld.aosphere= NULL; - if (re->scene) + if (re->scene && re->scene->world) re->scene->world->aosphere= NULL; } if (re->wrld.aotables) { MEM_freeN(re->wrld.aotables); re->wrld.aotables= NULL; - if (re->scene) + if (re->scene && re->scene->world) re->scene->world->aotables= NULL; } if (re->r.mode & R_RAYTRACE) |