remove unneeded checks from the python API

1 files changed, 56 insertions, 358 deletions

diff --git a/source/blender/python/api2_2x/Material.c b/source/blender/python/api2_2x/Material.c
index 6ed0541d9c1..f5d9dfeee06 100644
--- a/source/blender/python/api2_2x/Material.c
+++ b/source/blender/python/api2_2x/Material.c
@@ -1351,13 +1351,7 @@ static PyObject *Material_getIpo( BPy_Material * self )
 
 static PyObject *Material_getMode( BPy_Material * self )
 {
-	PyObject *attr = PyInt_FromLong( ( long ) self->material->mode );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.Mode attribute" );
+	return PyInt_FromLong( ( long ) self->material->mode );
 }
 
 static PyObject *Material_getRGBCol( BPy_Material * self )
@@ -1388,494 +1382,217 @@ static PyObject *Material_getSssCol( BPy_Material * self )
 
 static PyObject *Material_getSpecShader( BPy_Material * self )
 {
-	PyObject *attr = PyInt_FromLong( ( long ) self->material->spec_shader );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.specShader attribute" );
+	return PyInt_FromLong( ( long ) self->material->spec_shader );
 }
 
 static PyObject *Material_getDiffuseShader( BPy_Material * self )
 {
-	PyObject *attr = PyInt_FromLong( ( long ) self->material->diff_shader );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.diffuseShader attribute" );
+	return PyInt_FromLong( ( long ) self->material->diff_shader );
 }
 
 static PyObject *Material_getRoughness( BPy_Material * self )
 {
-	PyObject *attr = PyFloat_FromDouble( ( double ) self->material->roughness );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-					  "couldn't get Material.roughness attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->roughness );
 }
 
 static PyObject *Material_getSpecSize( BPy_Material * self )
 {
-	PyObject *attr = PyFloat_FromDouble( ( double ) self->material->param[2] );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-					  "couldn't get Material.specSize attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->param[2] );
 }
 
 static PyObject *Material_getDiffuseSize( BPy_Material * self )
 {
-	PyObject *attr = PyFloat_FromDouble( ( double ) self->material->param[0] );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-					  "couldn't get Material.diffuseSize attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->param[0] );
 }
 
 static PyObject *Material_getSpecSmooth( BPy_Material * self )
 {
-	PyObject *attr = PyFloat_FromDouble( ( double ) self->material->param[3] );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-					  "couldn't get Material.specSmooth attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->param[3] );
 }
 
 static PyObject *Material_getDiffuseSmooth( BPy_Material * self )
 {
-	PyObject *attr = PyFloat_FromDouble( ( double ) self->material->param[1] );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-					  "couldn't get Material.diffuseSmooth( attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->param[1] );
 }
 
 static PyObject *Material_getDiffuseDarkness( BPy_Material * self )
 {
-	PyObject *attr = PyFloat_FromDouble( ( double ) self->material->darkness );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-					  "couldn't get Material.diffuseDarkness attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->darkness );
 }
 
 static PyObject *Material_getRefracIndex( BPy_Material * self )
 {
-	PyObject *attr = PyFloat_FromDouble( ( double ) self->material->refrac );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-					  "couldn't get Material.refracIndex attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->refrac );
 }
 	
 static PyObject *Material_getRms( BPy_Material * self )
 {
-	PyObject *attr = PyFloat_FromDouble( ( double ) self->material->rms );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-					  "couldn't get Material.rms attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->rms );
 }
 
 static PyObject *Material_getAmb( BPy_Material * self )
 {
-	PyObject *attr = PyFloat_FromDouble( ( double ) self->material->amb );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.amb attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->amb );
 }
 
 static PyObject *Material_getEmit( BPy_Material * self )
 {
-	PyObject *attr = PyFloat_FromDouble( ( double ) self->material->emit );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.emit attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->emit );
 }
 
 static PyObject *Material_getAlpha( BPy_Material * self )
 {
-	PyObject *attr =
-		PyFloat_FromDouble( ( double ) self->material->alpha );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.alpha attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->alpha );
 }
 
 static PyObject *Material_getShadAlpha( BPy_Material * self )
 {
-	PyObject *attr =
-		PyFloat_FromDouble( ( double ) self->material->shad_alpha );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.shad_alpha attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->shad_alpha );
 }
 
 static PyObject *Material_getRef( BPy_Material * self )
 {
-	PyObject *attr = PyFloat_FromDouble( ( double ) self->material->ref );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.ref attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->ref );
 }
 
 static PyObject *Material_getSpec( BPy_Material * self )
 {
-	PyObject *attr = PyFloat_FromDouble( ( double ) self->material->spec );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.spec attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->spec );
 }
 
 static PyObject *Material_getSpecTransp( BPy_Material * self )
 {
-	PyObject *attr =
-		PyFloat_FromDouble( ( double ) self->material->spectra );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.specTransp attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->spectra );
 }
 
 static PyObject *Material_getAdd( BPy_Material * self )
 {
-	PyObject *attr = PyFloat_FromDouble( ( double ) self->material->add );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.add attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->add );
 }
 
 static PyObject *Material_getZOffset( BPy_Material * self )
 {
-	PyObject *attr =
-		PyFloat_FromDouble( ( double ) self->material->zoffs );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.zOffset attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->zoffs );
 }
 
 static PyObject *Material_getLightGroup( BPy_Material * self )
 {
-	PyObject *attr =
-		Group_CreatePyObject( self->material->group );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.lightGroup attribute" );
+	return Group_CreatePyObject( self->material->group );
 }
 
 static PyObject *Material_getHaloSize( BPy_Material * self )
 {
-	PyObject *attr =
-		PyFloat_FromDouble( ( double ) self->material->hasize );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.haloSize attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->hasize );
 }
 
 static PyObject *Material_getFlareSize( BPy_Material * self )
 {
-	PyObject *attr =
-		PyFloat_FromDouble( ( double ) self->material->flaresize );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.flareSize attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->flaresize );
 }
 
 static PyObject *Material_getFlareBoost( BPy_Material * self )
 {
-	PyObject *attr =
-		PyFloat_FromDouble( ( double ) self->material->flareboost );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.flareBoost attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->flareboost );
 }
 
 static PyObject *Material_getSubSize( BPy_Material * self )
 {
-	PyObject *attr =
-		PyFloat_FromDouble( ( double ) self->material->subsize );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.subSize attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->subsize );
 }
 
 static PyObject *Material_getHaloSeed( BPy_Material * self )
 {
-	PyObject *attr = PyInt_FromLong( ( long ) self->material->seed1 );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.haloSeed attribute" );
+	return PyInt_FromLong( ( long ) self->material->seed1 );
 }
 
 static PyObject *Material_getFlareSeed( BPy_Material * self )
 {
-	PyObject *attr = PyInt_FromLong( ( long ) self->material->seed2 );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.flareSeed attribute" );
+	return PyInt_FromLong( ( long ) self->material->seed2 );
 }
 
 static PyObject *Material_getHardness( BPy_Material * self )
 {
-	PyObject *attr = PyInt_FromLong( ( long ) self->material->har );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.hard attribute" );
+	return PyInt_FromLong( ( long ) self->material->har );
 }
 
 static PyObject *Material_getNFlares( BPy_Material * self )
 {
-	PyObject *attr = PyInt_FromLong( ( long ) self->material->flarec );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.nFlares attribute" );
+	return PyInt_FromLong( ( long ) self->material->flarec );
 }
 
 static PyObject *Material_getNStars( BPy_Material * self )
 {
-	PyObject *attr = PyInt_FromLong( ( long ) self->material->starc );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.nStars attribute" );
+	return PyInt_FromLong( ( long ) self->material->starc );
 }
 
 static PyObject *Material_getNLines( BPy_Material * self )
 {
-	PyObject *attr = PyInt_FromLong( ( long ) self->material->linec );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.nLines attribute" );
+	return PyInt_FromLong( ( long ) self->material->linec );
 }
 
 static PyObject *Material_getNRings( BPy_Material * self )
 {
-	PyObject *attr = PyInt_FromLong( ( long ) self->material->ringc );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.nRings attribute" );
+	return PyInt_FromLong( ( long ) self->material->ringc );
 }
 
 static PyObject *Material_getRayMirr( BPy_Material * self )
 {
-	PyObject *attr =
-		PyFloat_FromDouble( ( double ) self->material->ray_mirror );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.rayMirr attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->ray_mirror );
 }
 
 static PyObject *Material_getMirrDepth( BPy_Material * self )
 {
-	PyObject *attr = PyInt_FromLong( ( long ) self->material->ray_depth );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.rayMirrDepth attribute" );
+	return PyInt_FromLong( ( long ) self->material->ray_depth );
 }
 
 static PyObject *Material_getFresnelMirr( BPy_Material * self )
 {
-	PyObject *attr =
-		PyFloat_FromDouble( ( double ) self->material->fresnel_mir );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.fresnelDepth attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->fresnel_mir );
 }
 
 static PyObject *Material_getFresnelMirrFac( BPy_Material * self )
 {
-	PyObject *attr =
-		PyFloat_FromDouble( ( double ) self->material->fresnel_mir_i );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.fresnelDepthFac attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->fresnel_mir_i );
 }
 
 static PyObject *Material_getFilter( BPy_Material * self )
 {
-	PyObject *attr =
-		PyFloat_FromDouble( ( double ) self->material->filter );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.filter attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->filter );
 }
 
 static PyObject *Material_getTranslucency( BPy_Material * self )
 {
-	PyObject *attr =
-		PyFloat_FromDouble( ( double ) self->material->translucency );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.translucency attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->translucency );
 }
 
 static PyObject *Material_getIOR( BPy_Material * self )
 {
-	PyObject *attr = PyFloat_FromDouble( ( double ) self->material->ang );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.IOR attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->ang );
 }
 
 static PyObject *Material_getTransDepth( BPy_Material * self )
 {
-	PyObject *attr =
-		PyInt_FromLong( ( long ) self->material->ray_depth_tra );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.transDepth attribute" );
+	return PyInt_FromLong( ( long ) self->material->ray_depth_tra );
 }
 
 static PyObject *Material_getFresnelTrans( BPy_Material * self )
 {
-	PyObject *attr =
-		PyFloat_FromDouble( ( double ) self->material->fresnel_tra );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.fresnelTrans attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->fresnel_tra );
 }
 
 static PyObject *Material_getFresnelTransFac( BPy_Material * self )
 {
-	PyObject *attr =
-		PyFloat_FromDouble( ( double ) self->material->fresnel_tra_i );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.fresnelTransFac attribute" );
+	return PyFloat_FromDouble( ( double ) self->material->fresnel_tra_i );
 }
 
 static PyObject* Material_getRigidBodyFriction( BPy_Material * self )
 {
-	PyObject *attr =
-		PyFloat_FromDouble( ( double ) self->material->friction );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.friction" );
+	return PyFloat_FromDouble( ( double ) self->material->friction );
 }
 
 static PyObject* Material_getRigidBodyRestitution( BPy_Material * self )
 {
-	PyObject *attr =
-		PyFloat_FromDouble( ( double ) self->material->reflect );
-
-	if( attr )
-		return attr;
-
-	return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-				      "couldn't get Material.reflect" );
+	return PyFloat_FromDouble( ( double ) self->material->reflect );
 }
 
 /* SSS */
@@ -2926,54 +2643,35 @@ void EXPP_incr_mats_us( Material ** matlist, int len )
 static PyObject *Material_getColorComponent( BPy_Material * self, 
 							void * closure )
 {
-	PyObject *attr = NULL;
-
 	switch ( (int)closure ) {
 	case EXPP_MAT_COMP_R:
-		attr = PyFloat_FromDouble( ( double ) self->material->r );
-		break;
+		return PyFloat_FromDouble( ( double ) self->material->r );
 	case EXPP_MAT_COMP_G:
-		attr = PyFloat_FromDouble( ( double ) self->material->g );
-		break;
+		return PyFloat_FromDouble( ( double ) self->material->g );
 	case EXPP_MAT_COMP_B:
-		attr = PyFloat_FromDouble( ( double ) self->material->b );
-		break;
+		return PyFloat_FromDouble( ( double ) self->material->b );
 	case EXPP_MAT_COMP_SPECR:
-		attr = PyFloat_FromDouble( ( double ) self->material->specr );
-		break;
+		return PyFloat_FromDouble( ( double ) self->material->specr );
 	case EXPP_MAT_COMP_SPECG:
-		attr = PyFloat_FromDouble( ( double ) self->material->specg );
-		break;
+		return PyFloat_FromDouble( ( double ) self->material->specg );
 	case EXPP_MAT_COMP_SPECB:
-		attr = PyFloat_FromDouble( ( double ) self->material->specb );
-		break;
+		return PyFloat_FromDouble( ( double ) self->material->specb );
 	case EXPP_MAT_COMP_MIRR:
-		attr = PyFloat_FromDouble( ( double ) self->material->mirr );
-		break;
+		return PyFloat_FromDouble( ( double ) self->material->mirr );
 	case EXPP_MAT_COMP_MIRG:
-		attr = PyFloat_FromDouble( ( double ) self->material->mirg );
-		break;
+		return PyFloat_FromDouble( ( double ) self->material->mirg );
 	case EXPP_MAT_COMP_MIRB:
-		attr = PyFloat_FromDouble( ( double ) self->material->mirb );
-		break;
+		return PyFloat_FromDouble( ( double ) self->material->mirb );
 	case EXPP_MAT_COMP_SSSR:
-		attr = PyFloat_FromDouble( ( double ) self->material->sss_col[0] );
-		break;
+		return PyFloat_FromDouble( ( double ) self->material->sss_col[0] );
 	case EXPP_MAT_COMP_SSSG:
-		attr = PyFloat_FromDouble( ( double ) self->material->sss_col[1] );
-		break;
+		return PyFloat_FromDouble( ( double ) self->material->sss_col[1] );
 	case EXPP_MAT_COMP_SSSB:
-		attr = PyFloat_FromDouble( ( double ) self->material->sss_col[2] );
-		break;
+		return PyFloat_FromDouble( ( double ) self->material->sss_col[2] );
 	default:
 		return EXPP_ReturnPyObjError( PyExc_RuntimeError,
 					"unknown color component specified" );
 	}
-
-	if( !attr )
-		return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-					"PyFloat_FromDouble() failed" );
-	return attr;
 }
 
 static PyObject *Material_getColorband( BPy_Material * self, void * type)