disable GaussianAlpha from attempting to get a non existing socket - and add an assert if this is attempted.

4 files changed, 9 insertions, 5 deletions

diff --git a/source/blender/compositor/intern/COM_NodeBase.cpp b/source/blender/compositor/intern/COM_NodeBase.cpp
index 42946d7315e..26e86eed9e0 100644
--- a/source/blender/compositor/intern/COM_NodeBase.cpp
+++ b/source/blender/compositor/intern/COM_NodeBase.cpp
@@ -81,12 +81,14 @@ const bool NodeBase::isInputNode() const
 	return this->inputsockets.size() == 0;
 }
 
-OutputSocket *NodeBase::getOutputSocket(int index)
+OutputSocket *NodeBase::getOutputSocket(unsigned int index)
 {
+	BLI_assert(index < this->outputsockets.size());
 	return this->outputsockets[index];
 }
 
-InputSocket *NodeBase::getInputSocket(int index)
+InputSocket *NodeBase::getInputSocket(unsigned int index)
 {
+	BLI_assert(index < this->inputsockets.size());
 	return this->inputsockets[index];
 }
diff --git a/source/blender/compositor/intern/COM_NodeBase.h b/source/blender/compositor/intern/COM_NodeBase.h
index 5e3a4fa5531..54f80926b84 100644
--- a/source/blender/compositor/intern/COM_NodeBase.h
+++ b/source/blender/compositor/intern/COM_NodeBase.h
@@ -103,7 +103,7 @@ public:
 	 * @param index
 	 * the index of the needed outputsocket
 	 */
-	OutputSocket *getOutputSocket(const int index);
+	OutputSocket *getOutputSocket(const unsigned int index);
 	
 	/**
 	 * get the reference to the first outputsocket
@@ -117,7 +117,7 @@ public:
 	 * @param index
 	 * the index of the needed inputsocket
 	 */
-	InputSocket *getInputSocket(const int index);
+	InputSocket *getInputSocket(const unsigned int index);
 	
 	
 	virtual bool isStatic() const { return false; }
diff --git a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
index 10b651a4f05..1283ac48923 100644
--- a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
@@ -45,7 +45,7 @@ void *GaussianAlphaXBlurOperation::initializeTileData(rcti *rect, MemoryBuffer *
 
 void GaussianAlphaXBlurOperation::initExecution()
 {
-	BlurBaseOperation::initExecution();
+	/* BlurBaseOperation::initExecution(); */ /* until we suppoer size input - comment this */
 
 	if (this->sizeavailable) {
 		float rad = size * this->data->sizex;
diff --git a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
index cc854c96cf5..1d67c23e41b 100644
--- a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
@@ -45,6 +45,8 @@ void *GaussianAlphaYBlurOperation::initializeTileData(rcti *rect, MemoryBuffer *
 
 void GaussianAlphaYBlurOperation::initExecution()
 {
+	/* BlurBaseOperation::initExecution(); */ /* until we suppoer size input - comment this */
+
 	if (this->sizeavailable) {
 		float rad = size * this->data->sizey;
 		if (rad < 1)