Final render wouldn't set compositor's update_draw callback, so added NULL check
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 30 Nov 2012 11:26:57 +0000 (11:26 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 30 Nov 2012 11:26:57 +0000 (11:26 +0000)
Seems no extra notifiers should be added here.

source/blender/compositor/intern/COM_ExecutionGroup.cpp
source/blender/compositor/intern/COM_NodeOperation.h

index 7095ccd57b74159955bd227a7e6e3509c743fedd..ffc36281874712584646fa89f731b4e1b7ea72c6 100644 (file)
@@ -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;
index b0cc24fc487ab9b2bafae88e31ff5e3fa2136adb..f856d8e6a1148ecf2d3557bede181c7fb3e4df41 100644 (file)
@@ -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();