[Bf-blender-cvs] [f1ee24a2842] blender-v2.79a-release: Fix T52801: reload scripts causes Cycles viewport render crash.

[Brecht Van Lommel]

Commit: f1ee24a2842d45dc251fb917a369f1c215cd1f8c
Author: Brecht Van Lommel
Date:   Mon Sep 18 03:36:39 2017 +0200
Branches: blender-v2.79a-release
https://developer.blender.org/rBf1ee24a2842d45dc251fb917a369f1c215cd1f8c

Fix T52801: reload scripts causes Cycles viewport render crash.

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

M	source/blender/makesrna/intern/rna_render.c

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

diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c
index 44dcb72264a..73947cf8555 100644
--- a/source/blender/makesrna/intern/rna_render.c
+++ b/source/blender/makesrna/intern/rna_render.c
@@ -41,6 +41,7 @@
 #include "RE_engine.h"
 #include "RE_pipeline.h"
 
+#include "ED_render.h"
 
 /* Deprecated, only provided for API compatibility. */
 EnumPropertyItem rna_enum_render_pass_type_items[] = {
@@ -271,7 +272,7 @@ static void engine_update_render_passes(RenderEngine *engine, struct Scene *scen
 
 /* RenderEngine registration */
 
-static void rna_RenderEngine_unregister(Main *UNUSED(bmain), StructRNA *type)
+static void rna_RenderEngine_unregister(Main *bmain, StructRNA *type)
 {
 	RenderEngineType *et = RNA_struct_blender_type_get(type);
 
@@ -281,6 +282,9 @@ static void rna_RenderEngine_unregister(Main *UNUSED(bmain), StructRNA *type)
 	RNA_struct_free_extension(type, &et->ext);
 	BLI_freelinkN(&R_engines, et);
 	RNA_struct_free(&BLENDER_RNA, type);
+
+	/* Stop all renders in case we were using this one. */
+	ED_render_engine_changed(bmain);
 }
 
 static StructRNA *rna_RenderEngine_register(Main *bmain, ReportList *reports, void *data, const char *identifier,