Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2011-02-02 17:36:00 +0300
committerTon Roosendaal <ton@blender.org>2011-02-02 17:36:00 +0300
commitfc0d85ac59049a34a2de920207b982d6e6eeee68 (patch)
tree13123f74aed9696fc062c66b1fe8e677a058ad0b
parentf79f9115f2f7d65b767899967aa31bf6218ebdd6 (diff)
Bugfix #25913
Compositor: using "read sample buffers" after load file, without render layers in composite, crashed blender (NULL read)
-rw-r--r--source/blender/render/intern/source/pipeline.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 998f2489ab2..bdca5c315c2 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -2349,6 +2349,7 @@ void RE_MergeFullSample(Render *re, Main *bmain, Scene *sce, bNodeTree *ntree)
G.afbreek= 0;
re->main= bmain;
+ re->scene= sce;
/* first call RE_ReadRenderResult on every renderlayer scene. this creates Render structs */