diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-30 13:12:10 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-30 13:12:10 +0400 |
commit | 323e86694efe2fe4a2a8b570977d59c735942f90 (patch) | |
tree | cb445067b9753c8159ba4929f2757cbe2304715f /source/blender/compositor/intern/COM_NodeOperation.h | |
parent | ceedd5bd35273c27225f84cde2948e5b774e92fe (diff) |
Compositor should never add notifiers by himself, notifiers should be added
from main thread using job update callback.
Added new execution-time callback to bNodeTree which marks job to be updated.
The code here could be a bit not so obvious because in some cases job update
callback need to merge local tree, but it's only needed for old compositor
system which is gonna to be removed soon, so decided not to bother with
cleanup now. Removing old compositor system will also allow to drop stats_draw
callback from bNodeTree.
This should fix following bugs:
Diffstat (limited to 'source/blender/compositor/intern/COM_NodeOperation.h')
-rw-r--r-- | source/blender/compositor/intern/COM_NodeOperation.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h index 42d90eca38f..b0cc24fc487 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.h +++ b/source/blender/compositor/intern/COM_NodeOperation.h @@ -77,7 +77,7 @@ private: ThreadMutex m_mutex; /** - * @brief reference to the editing bNodeTree only used for break callback + * @brief reference to the editing bNodeTree, used for break and update callback */ const bNodeTree *m_btree; @@ -247,6 +247,9 @@ public: return this->m_btree->test_break(this->m_btree->tbh); } + inline void updateDraw() { + this->m_btree->update_draw(this->m_btree->udh); + } protected: NodeOperation(); |