[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48177] trunk/blender/source/blender/ compositor/nodes/COM_HueSaturationValueCorrectNode.cpp: [#31895] Connect ' Hue Correct' to 'Viewer' crashes.

Jeroen Bakker j.bakker at atmind.nl
Thu Jun 21 20:32:24 CEST 2012


Revision: 48177
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48177
Author:   jbakker
Date:     2012-06-21 18:32:23 +0000 (Thu, 21 Jun 2012)
Log Message:
-----------
[#31895] Connect 'Hue Correct' to 'Viewer' crashes.

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp

Modified: trunk/blender/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp	2012-06-21 18:22:43 UTC (rev 48176)
+++ trunk/blender/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp	2012-06-21 18:32:23 UTC (rev 48177)
@@ -46,27 +46,25 @@
 	bNode *editorsnode = getbNode();
 	CurveMapping *storage = (CurveMapping *)editorsnode->storage;
 	
-	if (colourSocket->isConnected() && outputSocket->isConnected()) {
-		ConvertRGBToHSVOperation *rgbToHSV = new ConvertRGBToHSVOperation();
-		ConvertHSVToRGBOperation *hsvToRGB = new ConvertHSVToRGBOperation();
-		HueSaturationValueCorrectOperation *changeHSV = new HueSaturationValueCorrectOperation();
-		MixBlendOperation *blend = new MixBlendOperation();
-	
-		colourSocket->relinkConnections(rgbToHSV->getInputSocket(0), 1, graph);
-		addLink(graph, rgbToHSV->getOutputSocket(), changeHSV->getInputSocket(0));
-		addLink(graph, changeHSV->getOutputSocket(), hsvToRGB->getInputSocket(0));
-		addLink(graph, hsvToRGB->getOutputSocket(), blend->getInputSocket(2));
-		addLink(graph, rgbToHSV->getInputSocket(0)->getConnection()->getFromSocket(), blend->getInputSocket(1));
-		valueSocket->relinkConnections(blend->getInputSocket(0), 0, graph);
-		outputSocket->relinkConnections(blend->getOutputSocket());
-	
-		changeHSV->setCurveMapping(storage);
-	
-		blend->setResolutionInputSocketIndex(1);
-	
-		graph->addOperation(rgbToHSV);
-		graph->addOperation(hsvToRGB);
-		graph->addOperation(changeHSV);
-		graph->addOperation(blend);
-	}
+	ConvertRGBToHSVOperation *rgbToHSV = new ConvertRGBToHSVOperation();
+	ConvertHSVToRGBOperation *hsvToRGB = new ConvertHSVToRGBOperation();
+	HueSaturationValueCorrectOperation *changeHSV = new HueSaturationValueCorrectOperation();
+	MixBlendOperation *blend = new MixBlendOperation();
+
+	colourSocket->relinkConnections(rgbToHSV->getInputSocket(0), 1, graph);
+	addLink(graph, rgbToHSV->getOutputSocket(), changeHSV->getInputSocket(0));
+	addLink(graph, changeHSV->getOutputSocket(), hsvToRGB->getInputSocket(0));
+	addLink(graph, hsvToRGB->getOutputSocket(), blend->getInputSocket(2));
+	addLink(graph, rgbToHSV->getInputSocket(0)->getConnection()->getFromSocket(), blend->getInputSocket(1));
+	valueSocket->relinkConnections(blend->getInputSocket(0), 0, graph);
+	outputSocket->relinkConnections(blend->getOutputSocket());
+
+	changeHSV->setCurveMapping(storage);
+
+	blend->setResolutionInputSocketIndex(1);
+
+	graph->addOperation(rgbToHSV);
+	graph->addOperation(hsvToRGB);
+	graph->addOperation(changeHSV);
+	graph->addOperation(blend);
 }




More information about the Bf-blender-cvs mailing list