[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46931] trunk/blender/source/blender: * Stopped flickering of preview images

[Jeroen Bakker]

Revision: 46931
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46931
Author:   jbakker
Date:     2012-05-23 10:31:16 +0000 (Wed, 23 May 2012)
Log Message:
-----------
 * Stopped flickering of preview images
 * Solved crash when first input socket of brightness node is not
connected

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/nodes/COM_BrightnessNode.cpp
    trunk/blender/source/blender/compositor/operations/COM_PreviewOperation.cpp
    trunk/blender/source/blender/nodes/composite/node_composite_tree.c

Modified: trunk/blender/source/blender/compositor/nodes/COM_BrightnessNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_BrightnessNode.cpp	2012-05-23 10:21:57 UTC (rev 46930)
+++ trunk/blender/source/blender/compositor/nodes/COM_BrightnessNode.cpp	2012-05-23 10:31:16 UTC (rev 46931)
@@ -28,12 +28,11 @@
 BrightnessNode::BrightnessNode(bNode *editorNode): Node(editorNode)
 {
 }
-/// @todo: add anti alias when not FSA
+
 void BrightnessNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
 {
 	BrightnessOperation *operation = new BrightnessOperation();
-	
-	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0));
+	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0),true, 0, graph);
 	this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1),true, 1, graph);
 	this->getInputSocket(2)->relinkConnections(operation->getInputSocket(2),true, 2, graph);
 	this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));

Modified: trunk/blender/source/blender/compositor/operations/COM_PreviewOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_PreviewOperation.cpp	2012-05-23 10:21:57 UTC (rev 46930)
+++ trunk/blender/source/blender/compositor/operations/COM_PreviewOperation.cpp	2012-05-23 10:31:16 UTC (rev 46931)
@@ -93,7 +93,6 @@
 			color[2] = 0.0f;
 			color[3] = 1.0f;
 			input->read(color, rx, ry, COM_PS_NEAREST, memoryBuffers);
-			/// @todo: linear conversion only when scene color management is selected, also check predivide.
 			linearrgb_to_srgb_v4(color, color);
 			F4TOCHAR4(color, outputBuffer+offset);
 			offset +=4;

Modified: trunk/blender/source/blender/nodes/composite/node_composite_tree.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/node_composite_tree.c	2012-05-23 10:21:57 UTC (rev 46930)
+++ trunk/blender/source/blender/nodes/composite/node_composite_tree.c	2012-05-23 10:31:16 UTC (rev 46931)
@@ -143,6 +143,16 @@
 			}
 		}
 		
+		/* copy over the preview buffers to update graduatly */
+		if (node->preview) {
+			bNodePreview *preview = MEM_callocN(sizeof(bNodePreview), "Preview");
+			preview->pad = node->preview->pad;
+			preview->xsize = node->preview->xsize;
+			preview->ysize = node->preview->ysize;
+			preview->rect = MEM_dupallocN(node->preview->rect);
+			node->new_node->preview = preview;
+		}
+		
 		for (sock= node->outputs.first; sock; sock= sock->next) {
 			sock->new_sock->cache= sock->cache;
 			compbuf_set_node(sock->new_sock->cache, node->new_node);