diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-30 15:26:57 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-30 15:26:57 +0400 |
| commit | 1db677a51cfb13a7f6df81a2799e2bb506145d3b (patch) | |
| tree | d7be6b5d3059b09278e7be457fdc9bd3f53bcb4d /source/blender/compositor | |
| parent | d2a741048a3eeda6009eb85347aef0169fd8be1b (diff) | |
Final render wouldn't set compositor's update_draw callback, so added NULL check
Seems no extra notifiers should be added here.
Diffstat (limited to 'source/blender/compositor')
| -rw-r--r-- | source/blender/compositor/intern/COM_ExecutionGroup.cpp | 3 | ||||
| -rw-r--r-- | source/blender/compositor/intern/COM_NodeOperation.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cpp b/source/blender/compositor/intern/COM_ExecutionGroup.cpp index 7095ccd57b7..ffc36281874 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.cpp +++ b/source/blender/compositor/intern/COM_ExecutionGroup.cpp @@ -352,7 +352,8 @@ void ExecutionGroup::execute(ExecutionSystem *graph) startEvaluated = true; numberEvaluated++; - bTree->update_draw(bTree->udh); + if (bTree->update_draw) + bTree->update_draw(bTree->udh); } else if (state == COM_ES_SCHEDULED) { finished = false; diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h index b0cc24fc487..f856d8e6a11 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.h +++ b/source/blender/compositor/intern/COM_NodeOperation.h @@ -248,7 +248,8 @@ public: } inline void updateDraw() { - this->m_btree->update_draw(this->m_btree->udh); + if (this->m_btree->update_draw) + this->m_btree->update_draw(this->m_btree->udh); } protected: NodeOperation(); |