blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Fix T52801: reload scripts causes Cycles viewport render crash.

This commit is contained in:
Brecht Van Lommel 2017-09-18 03:36:39 +02:00
parent c622533fa0
commit 6bf3dfbcdb
Notes: blender-bot 2023-02-14 08:42:53 +01:00 
Referenced by issue #53683, 2.79a release
Referenced by issue #52801, Cycles Rendered Viewport + Reload Scripts = Crash
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/makesrna/intern/rna_render.c
View File

@ -43,6 +43,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[] = {
@ -278,7 +279,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);
@ -288,6 +289,9 @@ static void rna_RenderEngine_unregister(Main *UNUSED(bmain), StructRNA *type)
RNA_struct_free_extension(type, &et->ext);
RNA_struct_free(&BLENDER_RNA, type);
BLI_freelinkN(&R_engines, et);
/* Stop all renders in case we were using this one. */
ED_render_engine_changed(bmain);
}
static StructRNA *rna_RenderEngine_register(