Spellfixes: colour -> color

7 files changed, 25 insertions, 25 deletions

diff --git a/source/blender/compositor/nodes/COM_ColorToBWNode.cpp b/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
index 430f317eae2..511fdf09f41 100644
--- a/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
+++ b/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
@@ -25,18 +25,18 @@
 #include "COM_ConvertColorToBWOperation.h"
 #include "COM_ExecutionSystem.h"
 
-ColourToBWNode::ColourToBWNode(bNode *editorNode) : Node(editorNode)
+ColorToBWNode::ColorToBWNode(bNode *editorNode) : Node(editorNode)
 {
 	/* pass */
 }
 
-void ColourToBWNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
+void ColorToBWNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
-	InputSocket *colourSocket = this->getInputSocket(0);
+	InputSocket *colorSocket = this->getInputSocket(0);
 	OutputSocket *valueSocket = this->getOutputSocket(0);
 	
 	ConvertColorToBWOperation *convertProg = new ConvertColorToBWOperation();
-	colourSocket->relinkConnections(convertProg->getInputSocket(0), 0, graph);
+	colorSocket->relinkConnections(convertProg->getInputSocket(0), 0, graph);
 	valueSocket->relinkConnections(convertProg->getOutputSocket(0));
 	graph->addOperation(convertProg);
 }
diff --git a/source/blender/compositor/nodes/COM_ColorToBWNode.h b/source/blender/compositor/nodes/COM_ColorToBWNode.h
index 9262634edda..f21c6ecef52 100644
--- a/source/blender/compositor/nodes/COM_ColorToBWNode.h
+++ b/source/blender/compositor/nodes/COM_ColorToBWNode.h
@@ -20,18 +20,18 @@
  *		Monique Dewanchand
  */
 
-#ifndef _COM_ColourToBWNode_h_
-#define _COM_ColourToBWNode_h_
+#ifndef _COM_ColorToBWNode_h_
+#define _COM_ColorToBWNode_h_
 
 #include "COM_Node.h"
 #include "DNA_node_types.h"
 /**
- * @brief ColourToBWNode
+ * @brief ColorToBWNode
  * @ingroup Node
  */
-class ColourToBWNode : public Node {
+class ColorToBWNode : public Node {
 public:
-	ColourToBWNode(bNode *editorNode);
+	ColorToBWNode(bNode *editorNode);
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 #endif
diff --git a/source/blender/compositor/nodes/COM_CompositorNode.cpp b/source/blender/compositor/nodes/COM_CompositorNode.cpp
index 6a6f2d1b4ff..28e466203c4 100644
--- a/source/blender/compositor/nodes/COM_CompositorNode.cpp
+++ b/source/blender/compositor/nodes/COM_CompositorNode.cpp
@@ -34,12 +34,12 @@ void CompositorNode::convertToOperations(ExecutionSystem *graph, CompositorConte
 	InputSocket *imageSocket = this->getInputSocket(0);
 	InputSocket *alphaSocket = this->getInputSocket(1);
 	if (imageSocket->isConnected()) {
-		CompositorOperation *colourAlphaProg = new CompositorOperation();
-		colourAlphaProg->setRenderData(context->getRenderData());
-		colourAlphaProg->setbNodeTree(context->getbNodeTree());
-		imageSocket->relinkConnections(colourAlphaProg->getInputSocket(0));
-		alphaSocket->relinkConnections(colourAlphaProg->getInputSocket(1));
-		graph->addOperation(colourAlphaProg);
-		addPreviewOperation(graph, colourAlphaProg->getInputSocket(0));
+		CompositorOperation *colorAlphaProg = new CompositorOperation();
+		colorAlphaProg->setRenderData(context->getRenderData());
+		colorAlphaProg->setbNodeTree(context->getbNodeTree());
+		imageSocket->relinkConnections(colorAlphaProg->getInputSocket(0));
+		alphaSocket->relinkConnections(colorAlphaProg->getInputSocket(1));
+		graph->addOperation(colorAlphaProg);
+		addPreviewOperation(graph, colorAlphaProg->getInputSocket(0));
 	}
 }
diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
index df125403f98..fd961030ebf 100644
--- a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
+++ b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_HueSaturationValueCorrectNode.h"
 
-#include "COM_ConvertColourToValueProg.h"
+#include "COM_ConvertColorToValueProg.h"
 #include "COM_ExecutionSystem.h"
 #include "COM_ConvertRGBToHSVOperation.h"
 #include "COM_ConvertHSVToRGBOperation.h"
@@ -41,7 +41,7 @@ HueSaturationValueCorrectNode::HueSaturationValueCorrectNode(bNode *editorNode)
 void HueSaturationValueCorrectNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *valueSocket = this->getInputSocket(0);
-	InputSocket *colourSocket = this->getInputSocket(1);
+	InputSocket *colorSocket = this->getInputSocket(1);
 	OutputSocket *outputSocket = this->getOutputSocket(0);
 	bNode *editorsnode = getbNode();
 	CurveMapping *storage = (CurveMapping *)editorsnode->storage;
@@ -51,7 +51,7 @@ void HueSaturationValueCorrectNode::convertToOperations(ExecutionSystem *graph,
 	HueSaturationValueCorrectOperation *changeHSV = new HueSaturationValueCorrectOperation();
 	MixBlendOperation *blend = new MixBlendOperation();
 
-	colourSocket->relinkConnections(rgbToHSV->getInputSocket(0), 1, graph);
+	colorSocket->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));
diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp b/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
index ef501317e48..9b55b809212 100644
--- a/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
+++ b/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_HueSaturationValueNode.h"
 
-#include "COM_ConvertColourToValueProg.h"
+#include "COM_ConvertColorToValueProg.h"
 #include "COM_ExecutionSystem.h"
 #include "COM_ConvertRGBToHSVOperation.h"
 #include "COM_ConvertHSVToRGBOperation.h"
@@ -40,7 +40,7 @@ HueSaturationValueNode::HueSaturationValueNode(bNode *editorNode) : Node(editorN
 void HueSaturationValueNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *valueSocket = this->getInputSocket(0);
-	InputSocket *colourSocket = this->getInputSocket(1);
+	InputSocket *colorSocket = this->getInputSocket(1);
 	OutputSocket *outputSocket = this->getOutputSocket(0);
 	bNode *editorsnode = getbNode();
 	NodeHueSat *storage = (NodeHueSat *)editorsnode->storage;
@@ -50,7 +50,7 @@ void HueSaturationValueNode::convertToOperations(ExecutionSystem *graph, Composi
 	ChangeHSVOperation *changeHSV = new ChangeHSVOperation();
 	MixBlendOperation *blend = new MixBlendOperation();
 
-	colourSocket->relinkConnections(rgbToHSV->getInputSocket(0), 0, graph);
+	colorSocket->relinkConnections(rgbToHSV->getInputSocket(0), 0, graph);
 	addLink(graph, rgbToHSV->getOutputSocket(), changeHSV->getInputSocket(0));
 	addLink(graph, changeHSV->getOutputSocket(), hsvToRGB->getInputSocket(0));
 	addLink(graph, hsvToRGB->getOutputSocket(), blend->getInputSocket(2));
diff --git a/source/blender/compositor/nodes/COM_MapValueNode.cpp b/source/blender/compositor/nodes/COM_MapValueNode.cpp
index ba2fc804f42..ac57ffed9da 100644
--- a/source/blender/compositor/nodes/COM_MapValueNode.cpp
+++ b/source/blender/compositor/nodes/COM_MapValueNode.cpp
@@ -32,12 +32,12 @@ MapValueNode::MapValueNode(bNode *editorNode) : Node(editorNode)
 
 void MapValueNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
-	InputSocket *colourSocket = this->getInputSocket(0);
+	InputSocket *colorSocket = this->getInputSocket(0);
 	OutputSocket *valueSocket = this->getOutputSocket(0);
 	TexMapping *storage =  (TexMapping *)this->getbNode()->storage;
 	MapValueOperation *convertProg = new MapValueOperation();
 	convertProg->setSettings(storage);
-	colourSocket->relinkConnections(convertProg->getInputSocket(0), 0, graph);
+	colorSocket->relinkConnections(convertProg->getInputSocket(0), 0, graph);
 	valueSocket->relinkConnections(convertProg->getOutputSocket(0));
 	graph->addOperation(convertProg);
 }
diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
index 95e759fde24..dfb46af841c 100644
--- a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
+++ b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
@@ -82,7 +82,7 @@ void RenderLayersNode::testSocketConnection(ExecutionSystem *system, int outputS
 
 void RenderLayersNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
-	testSocketConnection(graph, 0, new RenderLayersColourProg());
+	testSocketConnection(graph, 0, new RenderLayersColorProg());
 	testSocketConnection(graph, 1, new RenderLayersAlphaProg());
 	testSocketConnection(graph, 2, new RenderLayersDepthProg());
 	testSocketConnection(graph, 3, new RenderLayersNormalOperation());