diff options
| author | IRIE Shinsuke <irieshinsuke@yahoo.co.jp> | 2013-11-18 06:30:06 +0400 |
|---|---|---|
| committer | IRIE Shinsuke <irieshinsuke@yahoo.co.jp> | 2013-11-18 10:34:15 +0400 |
| commit | 69cbf3d83562f552811d82153e631ff1b4c7594a (patch) | |
| tree | 8085201abbd737f323e1ba440c674cba0ea4f411 /source/blender/editors/space_view3d/space_view3d.c | |
| parent | 4ea79fcdda6523faf875128ef3d6e8a8ecff67c9 (diff) | |
Fix for T36936: Crash when starting BI rendered view
Discard the render database when stopping the rendered preview,
otherwise starting it again may cause a segmentation fault because
undo/redo with non-rendered preview corrupts the database.
Diffstat (limited to 'source/blender/editors/space_view3d/space_view3d.c')
| -rw-r--r-- | source/blender/editors/space_view3d/space_view3d.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 58c0df6b6bd..3fbb78ac016 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -62,6 +62,7 @@ #include "WM_types.h" #include "RE_engine.h" +#include "RE_pipeline.h" #include "RNA_access.h" @@ -271,6 +272,8 @@ void ED_view3d_shade_update(Main *bmain, View3D *v3d, ScrArea *sa) if (rv3d && rv3d->render_engine) { WM_jobs_kill_type(wm, ar, WM_JOB_TYPE_RENDER_PREVIEW); + if (rv3d->render_engine->re) + RE_Database_Free(rv3d->render_engine->re); RE_engine_free(rv3d->render_engine); rv3d->render_engine = NULL; } |