diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-08-01 17:59:08 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-08-01 17:59:08 +0400 |
commit | 8a1a4a453dd3cca0319ca88dbab271089d178c20 (patch) | |
tree | 7510330834c0338388bd1923349c909b67a7e8cc /source/blender/compositor/operations/COM_CompositorOperation.cpp | |
parent | dd6d78840026e493045b441723e60546abdeefb6 (diff) |
Tie compositor will now update render result when changing node setup
Issue was caused by the way how render result was acquiring -- pointer
to render data was used to find needed render descriptor. It's not
reliable since render contains copy of scene's render data, not pointer
to this data.
Use node scene's id name for render result acquiring, the same way
as it was done in old compositor system.
Diffstat (limited to 'source/blender/compositor/operations/COM_CompositorOperation.cpp')
-rw-r--r-- | source/blender/compositor/operations/COM_CompositorOperation.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cpp b/source/blender/compositor/operations/COM_CompositorOperation.cpp index 57a4639ecba..600ee5e1d7e 100644 --- a/source/blender/compositor/operations/COM_CompositorOperation.cpp +++ b/source/blender/compositor/operations/COM_CompositorOperation.cpp @@ -68,8 +68,7 @@ void CompositorOperation::initExecution() void CompositorOperation::deinitExecution() { if (!isBreaked()) { - const RenderData *rd = this->m_rd; - Render *re = RE_GetRender_FromData(rd); + Render *re = RE_GetRender(this->m_scene->id.name); RenderResult *rr = RE_AcquireResultWrite(re); if (rr) { @@ -165,7 +164,7 @@ void CompositorOperation::determineResolution(unsigned int resolution[], unsigne // check actual render resolution with cropping it may differ with cropped border.rendering // FIX for: [31777] Border Crop gives black (easy) - Render *re = RE_GetRender_FromData(this->m_rd); + Render *re = RE_GetRender(this->m_scene->id.name); if (re) { RenderResult *rr = RE_AcquireResultRead(re); if (rr) { |