disable GaussianAlpha from attempting to get a non existing socket - and add an asser...
authorCampbell Barton <ideasman42@gmail.com>
Sat, 16 Jun 2012 19:34:38 +0000 (19:34 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 16 Jun 2012 19:34:38 +0000 (19:34 +0000)
source/blender/compositor/intern/COM_NodeBase.cpp
source/blender/compositor/intern/COM_NodeBase.h
source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp

index 42946d7..26e86ee 100644 (file)
@@ -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];
 }
index 5e3a4fa..54f8092 100644 (file)
@@ -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; }
index 10b651a..1283ac4 100644 (file)
@@ -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;
index cc854c9..1d67c23 100644 (file)
@@ -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)