[Bf-blender-cvs] [69cbf3d] master: Fix for T36936: Crash when starting BI rendered view

[IRIE Shinsuke]

Commit: 69cbf3d83562f552811d82153e631ff1b4c7594a
Author: IRIE Shinsuke
Date:   Mon Nov 18 11:30:06 2013 +0900
http://developer.blender.org/rB69cbf3d83562f552811d82153e631ff1b4c7594a

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.

===================================================================

M	source/blender/editors/space_view3d/space_view3d.c

===================================================================

diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 58c0df6..3fbb78a 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;
 			}