[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52681] trunk/blender/source/blender/ compositor/intern: Final render wouldn't set compositor' s update_draw callback, so added NULL check

[Sergey Sharybin]

Revision: 52681
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52681
Author:   nazgul
Date:     2012-11-30 11:26:57 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
Final render wouldn't set compositor's update_draw callback, so added NULL check

Seems no extra notifiers should be added here.

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/intern/COM_ExecutionGroup.cpp
    trunk/blender/source/blender/compositor/intern/COM_NodeOperation.h

Modified: trunk/blender/source/blender/compositor/intern/COM_ExecutionGroup.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_ExecutionGroup.cpp	2012-11-30 11:01:14 UTC (rev 52680)
+++ trunk/blender/source/blender/compositor/intern/COM_ExecutionGroup.cpp	2012-11-30 11:26:57 UTC (rev 52681)
@@ -352,7 +352,8 @@
 				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;

Modified: trunk/blender/source/blender/compositor/intern/COM_NodeOperation.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_NodeOperation.h	2012-11-30 11:01:14 UTC (rev 52680)
+++ trunk/blender/source/blender/compositor/intern/COM_NodeOperation.h	2012-11-30 11:26:57 UTC (rev 52681)
@@ -248,7 +248,8 @@
 	}
 
 	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();