merge with trunk (15330 -> 15566)
[blender.git] / source / gameengine / Converter / BL_ShapeActionActuator.cpp
index 58d46d76e5b3df302fe1dd495171161f88cc9f5c..41bf565a4d87a880e0718f9fcc8e713dd21e26fc 100644 (file)
@@ -1,5 +1,5 @@
 /**
-* $Id$
+* $Id:BL_ShapeActionActuator.cpp 15330 2008-06-23 16:37:51Z theeth $
 *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -604,6 +604,9 @@ PyObject* BL_ShapeActionActuator::PySetAction(PyObject* self,
                                m_blendframe = 0.f;
                }
        }
+       else {
+               return NULL;
+       }
        
        Py_INCREF(Py_None);
        return Py_None;
@@ -623,6 +626,9 @@ PyObject* BL_ShapeActionActuator::PySetStart(PyObject* self,
        {
                m_startframe = start;
        }
+       else {
+               return NULL;
+       }
        
        Py_INCREF(Py_None);
        return Py_None;
@@ -642,6 +648,9 @@ PyObject* BL_ShapeActionActuator::PySetEnd(PyObject* self,
        {
                m_endframe = end;
        }
+       else {
+               return NULL;
+       }
        
        Py_INCREF(Py_None);
        return Py_None;
@@ -662,6 +671,9 @@ PyObject* BL_ShapeActionActuator::PySetBlendin(PyObject* self,
        {
                m_blendin = blendin;
        }
+       else {
+               return NULL;
+       }
        
        Py_INCREF(Py_None);
        return Py_None;
@@ -687,6 +699,9 @@ PyObject* BL_ShapeActionActuator::PySetBlendtime(PyObject* self,
                if (m_blendframe>m_blendin)
                        m_blendframe = m_blendin;
        }
+       else {
+               return NULL;
+       }
        
        Py_INCREF(Py_None);
        return Py_None;
@@ -708,6 +723,9 @@ PyObject* BL_ShapeActionActuator::PySetPriority(PyObject* self,
        {
                m_priority = priority;
        }
+       else {
+               return NULL;
+       }
        
        Py_INCREF(Py_None);
        return Py_None;
@@ -731,6 +749,9 @@ PyObject* BL_ShapeActionActuator::PySetFrame(PyObject* self,
                else if (m_localtime>m_endframe)
                        m_localtime=m_endframe;
        }
+       else {
+               return NULL;
+       }
        
        Py_INCREF(Py_None);
        return Py_None;
@@ -751,6 +772,9 @@ PyObject* BL_ShapeActionActuator::PySetProperty(PyObject* self,
        {
                m_propname = string;
        }
+       else {
+               return NULL;
+       }
        
        Py_INCREF(Py_None);
        return Py_None;