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:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-05-02 16:52:19 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-05-02 16:54:13 +0400
commitb62c2a913bb41f858371594dfab0448bddb773d0 (patch)
tree20b29ef136b6064793dd52d45ff7136b9f878b57 /source/blender/render/intern/include
parent1552b56d9c0c9368f5f20a18db2e47a80f54537b (diff)
Fix T39985: crash while rendering a scene with compositing nodes using another scene
The issue was caused by the wrong scene used to acquire render result for. Now made it so render pipeline reports currently rendering scene to the job via special callback. This also solves missing tile highlight issue when rendering multiple scenes in the compositor.
Diffstat (limited to 'source/blender/render/intern/include')
-rw-r--r--source/blender/render/intern/include/render_types.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index cfebddeba7c..eeb0544cf73 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -256,6 +256,8 @@ struct Render
void *dch;
void (*display_update)(void *handle, RenderResult *rr, volatile rcti *rect);
void *duh;
+ void (*current_scene_update)(void *handle, struct Scene *scene);
+ void *suh;
void (*stats_draw)(void *handle, RenderStats *ri);
void *sdh;