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>2012-08-01 17:59:08 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-08-01 17:59:08 +0400
commit8a1a4a453dd3cca0319ca88dbab271089d178c20 (patch)
tree7510330834c0338388bd1923349c909b67a7e8cc /source/blender/compositor/operations/COM_CompositorOperation.h
parentdd6d78840026e493045b441723e60546abdeefb6 (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.h')
-rw-r--r--source/blender/compositor/operations/COM_CompositorOperation.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/compositor/operations/COM_CompositorOperation.h b/source/blender/compositor/operations/COM_CompositorOperation.h
index 491fe3eb4e4..51a31105d5c 100644
--- a/source/blender/compositor/operations/COM_CompositorOperation.h
+++ b/source/blender/compositor/operations/COM_CompositorOperation.h
@@ -31,6 +31,8 @@
*/
class CompositorOperation : public NodeOperation {
private:
+ const Scene *m_scene;
+
/**
* @brief local reference to the scene
*/
@@ -63,6 +65,7 @@ private:
public:
CompositorOperation();
void executeRegion(rcti *rect, unsigned int tileNumber);
+ void setScene(const Scene *scene) { this->m_scene = scene; }
void setRenderData(const RenderData *rd) { this->m_rd = rd; }
bool isOutputOperation(bool rendering) const { return true; }
void initExecution();