[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59335] trunk/blender/source/blender/ editors/render/render_internal.c: fix [#36347] Blender crashes when clicking on 'render' in 'viewport shading'

[Campbell Barton]

Revision: 59335
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59335
Author:   campbellbarton
Date:     2013-08-20 18:55:41 +0000 (Tue, 20 Aug 2013)
Log Message:
-----------
fix [#36347] Blender crashes when clicking on 'render' in 'viewport shading'

Modified Paths:
--------------
    trunk/blender/source/blender/editors/render/render_internal.c

Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c	2013-08-20 18:51:06 UTC (rev 59334)
+++ trunk/blender/source/blender/editors/render/render_internal.c	2013-08-20 18:55:41 UTC (rev 59335)
@@ -804,6 +804,11 @@
 	return true;
 }
 
+static bool render_view3d_is_valid(RenderPreview *rp)
+{
+	return (rp->rv3d->render_engine != NULL);
+}
+
 /* called by renderer, checks job value */
 static int render_view3d_break(void *rpv)
 {
@@ -813,8 +818,9 @@
 		return 1;
 	
 	/* during render, rv3d->engine can get freed */
-	if (rp->rv3d->render_engine == NULL)
+	if (render_view3d_is_valid(rp) == false) {
 		*rp->stop = 1;
+	}
 	
 	return *(rp->stop);
 }
@@ -928,8 +934,11 @@
 		RE_Database_Preprocess(re);
 
 		/* conversion not completed, need to do it again */
-		if (!rstats->convertdone)
-			rp->engine->job_update_flag |= PR_UPDATE_DATABASE;
+		if (!rstats->convertdone) {
+			if (render_view3d_is_valid(rp)) {
+				rp->engine->job_update_flag |= PR_UPDATE_DATABASE;
+			}
+		}
 
 		// printf("dbase update\n");
 	}