[Bf-blender-cvs] [2771268] master: Fix T38726: blender internal viewport render crash when deleting render layer.

[Brecht Van Lommel]

Commit: 277126881d691bc8d4dadfc657f2c2784cb1308f
Author: Brecht Van Lommel
Date:   Fri Feb 21 15:10:47 2014 +0100
https://developer.blender.org/rB277126881d691bc8d4dadfc657f2c2784cb1308f

Fix T38726: blender internal viewport render crash when deleting render layer.

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

M       source/blender/render/intern/source/pipeline.c

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

diff --git a/source/blender/render/intern/source/pipeline.c 
b/source/blender/render/intern/source/pipeline.c
index 1501c04..e381a7e 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 */
                        }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs