[Bf-blender-cvs] [4a8421f] master: Fix T44463 - crash on "Full Sample"
Dalai Felinto
noreply at git.blender.org
Wed Apr 22 21:48:37 CEST 2015
Commit: 4a8421faa45c89399cb58ea7b372a6fe65721a55
Author: Dalai Felinto
Date: Wed Apr 22 16:38:30 2015 -0300
Branches: master
https://developer.blender.org/rB4a8421faa45c89399cb58ea7b372a6fe65721a55
Fix T44463 - crash on "Full Sample"
===================================================================
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 a1fbe7c..7b5692f 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -2233,7 +2233,7 @@ static void do_merge_fullsample(Render *re, bNodeTree *ntree)
}
}
- for (nr = 0, rv = re->result->views.first; rv; rv = rv->next, nr++) {
+ for (nr = 0, rv = rectfs->first; rv; rv = rv->next, nr++) {
rectf = rv->rectf;
/* ensure we get either composited result or the active layer */
More information about the Bf-blender-cvs
mailing list