Bugfix #25913
authorTon Roosendaal <ton@blender.org>
Wed, 2 Feb 2011 14:36:00 +0000 (14:36 +0000)
committerTon Roosendaal <ton@blender.org>
Wed, 2 Feb 2011 14:36:00 +0000 (14:36 +0000)
Compositor: using "read sample buffers" after load file, without
render layers in composite, crashed blender (NULL read)

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

index 998f2489ab2d4b849e21a2e181c608dc865c7855..bdca5c315c2a65ba602a5d5f614c0cea4900be21 100644 (file)
@@ -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 */