From 277126881d691bc8d4dadfc657f2c2784cb1308f Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 21 Feb 2014 15:10:47 +0100 Subject: Fix T38726: blender internal viewport render crash when deleting render layer. --- source/blender/render/intern/source/pipeline.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 1501c04a650..e381a7ea6f5 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -503,6 +503,7 @@ static int check_mode_full_sample(RenderData *rd) void RE_InitState(Render *re, Render *source, RenderData *rd, SceneRenderLayer *srl, int winx, int winy, rcti *disprect) { bool had_freestyle = (re->r.mode & R_EDGE_FRS) != 0; + int prev_actlay = re->r.actlay; re->ok = TRUE; /* maybe flag */ @@ -602,7 +603,8 @@ void RE_InitState(Render *re, Render *source, RenderData *rd, SceneRenderLayer * re->result = NULL; } else if (re->result) { - if (re->result->rectx == re->rectx && re->result->recty == re->recty) { + if (re->result->rectx == re->rectx && re->result->recty == re->recty && + prev_actlay == re->r.actlay) { /* keep render result, this avoids flickering black tiles * when the preview changes */ } -- cgit v1.2.3