[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47953] trunk/blender/source/blender/ compositor: fix for using un-initialized memory in the new compositor for the split view node .

Campbell Barton ideasman42 at gmail.com
Fri Jun 15 15:35:31 CEST 2012


Revision: 47953
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47953
Author:   campbellbarton
Date:     2012-06-15 13:35:24 +0000 (Fri, 15 Jun 2012)
Log Message:
-----------
fix for using un-initialized memory in the new compositor for the split view node.

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/COM_defines.h
    trunk/blender/source/blender/compositor/intern/COM_ExecutionGroup.cpp
    trunk/blender/source/blender/compositor/nodes/COM_SplitViewerNode.cpp

Modified: trunk/blender/source/blender/compositor/COM_defines.h
===================================================================
--- trunk/blender/source/blender/compositor/COM_defines.h	2012-06-15 12:49:48 UTC (rev 47952)
+++ trunk/blender/source/blender/compositor/COM_defines.h	2012-06-15 13:35:24 UTC (rev 47953)
@@ -101,6 +101,8 @@
 	COM_TO_RULE_OF_THIRDS = 3
 } OrderOfChunks;
 
+#define COM_ORDER_OF_CHUNKS_DEFAULT COM_TO_CENTER_OUT
+
 #define COM_RULE_OF_THIRDS_DIVIDER 100.0f
 
 #define COM_NUMBER_OF_CHANNELS 4

Modified: trunk/blender/source/blender/compositor/intern/COM_ExecutionGroup.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_ExecutionGroup.cpp	2012-06-15 12:49:48 UTC (rev 47952)
+++ trunk/blender/source/blender/compositor/intern/COM_ExecutionGroup.cpp	2012-06-15 13:35:24 UTC (rev 47953)
@@ -229,7 +229,7 @@
 	NodeOperation *operation = this->getOutputNodeOperation();
 	float centerX = 0.5;
 	float centerY = 0.5;
-	int chunkorder = COM_TO_CENTER_OUT;
+	OrderOfChunks chunkorder = COM_ORDER_OF_CHUNKS_DEFAULT;
 
 	if (operation->isViewerOperation()) {
 		ViewerBaseOperation *viewer = (ViewerBaseOperation*)operation;

Modified: trunk/blender/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_SplitViewerNode.cpp	2012-06-15 12:49:48 UTC (rev 47952)
+++ trunk/blender/source/blender/compositor/nodes/COM_SplitViewerNode.cpp	2012-06-15 13:35:24 UTC (rev 47953)
@@ -41,6 +41,7 @@
 		splitViewerOperation->setImage(image);
 		splitViewerOperation->setImageUser(imageUser);
 		splitViewerOperation->setActive((this->getbNode()->flag & NODE_DO_OUTPUT) && this->isInActiveGroup());
+		splitViewerOperation->setChunkOrder(COM_ORDER_OF_CHUNKS_DEFAULT);
 		splitViewerOperation->setSplitPercentage(this->getbNode()->custom1);
 		splitViewerOperation->setXSplit(!this->getbNode()->custom2);
 		image1Socket->relinkConnections(splitViewerOperation->getInputSocket(0), 0, graph);




More information about the Bf-blender-cvs mailing list