Page MenuHome
Files F1117

patch-TexMatLamp-p2
Public
Actions

Authored By
Ken Hughes (khughes)
Nov 13 2013, 12:54 PM
Size
19 KB
Subscribers
None

patch-TexMatLamp-p2
View Options

--- source/blender/python/api2_2x/Lamp.c 2005-09-18 08:32:29.000000000 -0700
+++ source/blender/python/api2_2x/Lamp.c 2005-09-18 07:29:35.000000000 -0700
@@ -1472,87 +1472,87 @@
static PyObject *Lamp_oldsetName( BPy_Lamp * self, PyObject * args )
{
- return EXPP_setterWrapper ( (void *)self, args, (void *)Lamp_setName );
+ return EXPP_setterWrapper ( (void *)self, args, (setter)Lamp_setName );
}
static PyObject *Lamp_oldsetSamples( BPy_Lamp * self, PyObject * args )
{
- return EXPP_setterWrapper ( (void *)self, args, (void *)Lamp_setSamples );
+ return EXPP_setterWrapper ( (void *)self, args, (setter)Lamp_setSamples );
}
static PyObject *Lamp_oldsetBufferSize( BPy_Lamp * self, PyObject * args )
{
- return EXPP_setterWrapper ( (void *)self, args, (void *)Lamp_setBufferSize );
+ return EXPP_setterWrapper ( (void *)self, args, (setter)Lamp_setBufferSize );
}
static PyObject *Lamp_oldsetHaloStep( BPy_Lamp * self, PyObject * args )
{
- return EXPP_setterWrapper ( (void *)self, args, (void *)Lamp_setHaloStep );
+ return EXPP_setterWrapper ( (void *)self, args, (setter)Lamp_setHaloStep );
}
static PyObject *Lamp_oldsetEnergy( BPy_Lamp * self, PyObject * args )
{
- return EXPP_setterWrapper ( (void *)self, args, (void *)Lamp_setEnergy );
+ return EXPP_setterWrapper ( (void *)self, args, (setter)Lamp_setEnergy );
}
static PyObject *Lamp_oldsetDist( BPy_Lamp * self, PyObject * args )
{
- return EXPP_setterWrapper ( (void *)self, args, (void *)Lamp_setDist );
+ return EXPP_setterWrapper ( (void *)self, args, (setter)Lamp_setDist );
}
static PyObject *Lamp_oldsetSpotSize( BPy_Lamp * self, PyObject * args )
{
- return EXPP_setterWrapper ( (void *)self, args, (void *)Lamp_setSpotSize );
+ return EXPP_setterWrapper ( (void *)self, args, (setter)Lamp_setSpotSize );
}
static PyObject *Lamp_oldsetSpotBlend( BPy_Lamp * self, PyObject * args )
{
- return EXPP_setterWrapper ( (void *)self, args, (void *)Lamp_setSpotBlend );
+ return EXPP_setterWrapper ( (void *)self, args, (setter)Lamp_setSpotBlend );
}
static PyObject *Lamp_oldsetClipStart( BPy_Lamp * self, PyObject * args )
{
- return EXPP_setterWrapper ( (void *)self, args, (void *)Lamp_setClipStart );
+ return EXPP_setterWrapper ( (void *)self, args, (setter)Lamp_setClipStart );
}
static PyObject *Lamp_oldsetClipEnd( BPy_Lamp * self, PyObject * args )
{
- return EXPP_setterWrapper ( (void *)self, args, (void *)Lamp_setClipEnd );
+ return EXPP_setterWrapper ( (void *)self, args, (setter)Lamp_setClipEnd );
}
static PyObject *Lamp_oldsetBias( BPy_Lamp * self, PyObject * args )
{
- return EXPP_setterWrapper ( (void *)self, args, (void *)Lamp_setBias );
+ return EXPP_setterWrapper ( (void *)self, args, (setter)Lamp_setBias );
}
static PyObject *Lamp_oldsetSoftness( BPy_Lamp * self, PyObject * args )
{
- return EXPP_setterWrapper ( (void *)self, args, (void *)Lamp_setSoftness );
+ return EXPP_setterWrapper ( (void *)self, args, (setter)Lamp_setSoftness );
}
static PyObject *Lamp_oldsetHaloInt( BPy_Lamp * self, PyObject * args )
{
- return EXPP_setterWrapper ( (void *)self, args, (void *)Lamp_setHaloInt );
+ return EXPP_setterWrapper ( (void *)self, args, (setter)Lamp_setHaloInt );
}
static PyObject *Lamp_oldsetQuad1( BPy_Lamp * self, PyObject * args )
{
- return EXPP_setterWrapper ( (void *)self, args, (void *)Lamp_setQuad1 );
+ return EXPP_setterWrapper ( (void *)self, args, (setter)Lamp_setQuad1 );
}
static PyObject *Lamp_oldsetQuad2( BPy_Lamp * self, PyObject * args )
{
- return EXPP_setterWrapper ( (void *)self, args, (void *)Lamp_setQuad2 );
+ return EXPP_setterWrapper ( (void *)self, args, (setter)Lamp_setQuad2 );
}
static PyObject *Lamp_oldsetIpo( BPy_Lamp * self, PyObject * args )
{
- return EXPP_setterWrapper ( (void *)self, args, (void *)Lamp_setIpo );
+ return EXPP_setterWrapper ( (void *)self, args, (setter)Lamp_setIpo );
}
static PyObject *Lamp_oldsetCol( BPy_Lamp * self, PyObject * args )
{
- return EXPP_setterWrapper ( (void *)self, args, (void *)Lamp_setCol );
+ return EXPP_setterWrapper ( (void *)self, args, (setter)Lamp_setCol );
}
/*
@@ -1570,7 +1570,7 @@
if( self->lamp->ipo ) {
PyObject *value = Py_BuildValue( "(O)", Py_None );
- EXPP_setterWrapper ( (void *)self, value, (void *)Lamp_setIpo );
+ EXPP_setterWrapper ( (void *)self, value, (setter)Lamp_setIpo );
Py_DECREF ( value );
return EXPP_incr_ret_True();
}
@@ -1613,7 +1613,7 @@
/* build tuple, call wrapper */
value = Py_BuildValue( "(i)", type );
- error = EXPP_setterWrapper ( (void *)self, value, (void *)Lamp_setType );
+ error = EXPP_setterWrapper ( (void *)self, value, (setter)Lamp_setType );
Py_DECREF ( value );
return error;
}
@@ -1670,7 +1670,7 @@
/* build tuple, call wrapper */
value = Py_BuildValue( "(i)", flag );
- error = EXPP_setterWrapper ( (void *)self, value, (void *)Lamp_setMode );
+ error = EXPP_setterWrapper ( (void *)self, value, (setter)Lamp_setMode );
Py_DECREF ( value );
return error;
}
--- source/blender/python/api2_2x/gen_utils.h 2005-09-18 08:33:18.000000000 -0700
+++ source/blender/python/api2_2x/gen_utils.h 2005-09-18 07:25:08.000000000 -0700
@@ -126,10 +126,10 @@
*/
PyObject *EXPP_setterWrapper ( PyObject * self, PyObject * args,
- int (*func)( PyObject * self, PyObject * args ));
+ setter func);
PyObject *EXPP_setterWrapperTuple ( PyObject * self, PyObject * args,
- int (*func)( PyObject * self, PyObject * args ));
+ setter func);
/* scriplinks-related: */
PyObject *EXPP_getScriptLinks(ScriptLink *slink, PyObject *args, int is_scene);
--- source/blender/python/api2_2x/gen_utils.c 2005-09-18 08:33:15.000000000 -0700
+++ source/blender/python/api2_2x/gen_utils.c 2005-09-18 07:25:11.000000000 -0700
@@ -835,7 +835,7 @@
*/
PyObject *EXPP_setterWrapper ( PyObject * self, PyObject * args,
- int (*func)( PyObject * self, PyObject * args ))
+ setter func)
{
int error;
@@ -843,7 +843,7 @@
return EXPP_ReturnPyObjError( PyExc_RuntimeError,
"expected tuple of one item" );
- error = func ( self, PySequence_Fast_GET_ITEM( args, 0 ) );
+ error = func ( self, PySequence_Fast_GET_ITEM( args, 0 ), NULL );
if ( !error ) {
Py_INCREF( Py_None );
return Py_None;
@@ -858,7 +858,7 @@
*/
PyObject *EXPP_setterWrapperTuple ( PyObject * self, PyObject * args,
- int (*func)( PyObject * self, PyObject * args ))
+ setter func)
{
int error;
@@ -866,7 +866,7 @@
return EXPP_ReturnPyObjError( PyExc_RuntimeError,
"expected tuple" );
- error = func ( self, args );
+ error = func ( self, args, NULL );
if ( !error ) {
Py_INCREF( Py_None );
return Py_None;
--- source/blender/python/api2_2x/Texture.c 2005-09-18 08:33:03.000000000 -0700
+++ source/blender/python/api2_2x/Texture.c 2005-09-18 07:37:39.000000000 -0700
@@ -2389,18 +2389,18 @@
static PyObject *Texture_oldsetImage( BPy_Texture * self, PyObject * args )
{
return EXPP_setterWrapper( (void *)self, args,
- (void *)Texture_setImage );
+ (setter)Texture_setImage );
}
static PyObject *Texture_oldsetName( BPy_Texture * self, PyObject * args )
{
return EXPP_setterWrapper( (void *)self, args,
- (void *)Texture_setName );
+ (setter)Texture_setName );
}
static PyObject *Texture_oldsetIpo( BPy_Texture * self, PyObject * args )
{
- return EXPP_setterWrapper ( (void *)self, args, (void *)Texture_setIpo );
+ return EXPP_setterWrapper ( (void *)self, args, (setter)Texture_setIpo );
}
/*
@@ -2413,7 +2413,7 @@
if( self->texture->ipo ) {
PyObject *value = Py_BuildValue( "(O)", Py_None );
- EXPP_setterWrapper( (void *)self, value, (void *)Texture_setIpo );
+ EXPP_setterWrapper( (void *)self, value, (setter)Texture_setIpo );
Py_DECREF( value );
return EXPP_incr_ret_True();
}
@@ -2456,7 +2456,7 @@
/* build tuple, call wrapper */
value = Py_BuildValue( "(i)", flag );
- error = EXPP_setterWrapper( (void *)self, value, (void *)Texture_setFlags );
+ error = EXPP_setterWrapper( (void *)self, value, (setter)Texture_setFlags );
Py_DECREF ( value );
return error;
}
--- source/blender/python/api2_2x/Material.c 2005-09-18 08:32:37.000000000 -0700
+++ source/blender/python/api2_2x/Material.c 2005-09-18 07:33:47.000000000 -0700
@@ -2707,220 +2707,220 @@
static PyObject *Matr_oldsetAdd( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setAdd );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setAdd );
}
static PyObject *Matr_oldsetAlpha( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setAlpha );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setAlpha );
}
static PyObject *Matr_oldsetAmb( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setAmb );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setAmb );
}
static PyObject *Matr_oldsetDiffuseDarkness( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setDiffuseDarkness );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setDiffuseDarkness );
}
static PyObject *Matr_oldsetDiffuseShader( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setDiffuseShader );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setDiffuseShader );
}
static PyObject *Matr_oldsetDiffuseSize( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setDiffuseSize );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setDiffuseSize );
}
static PyObject *Matr_oldsetDiffuseSmooth( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setDiffuseSmooth );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setDiffuseSmooth );
}
static PyObject *Matr_oldsetEmit( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setEmit );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setEmit );
}
static PyObject *Matr_oldsetFilter( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setFilter );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setFilter );
}
static PyObject *Matr_oldsetFlareBoost( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setFlareBoost );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setFlareBoost );
}
static PyObject *Matr_oldsetFlareSeed( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setFlareSeed );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setFlareSeed );
}
static PyObject *Matr_oldsetFlareSize( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setFlareSize );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setFlareSize );
}
static PyObject *Matr_oldsetFresnelMirr( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setFresnelMirr );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setFresnelMirr );
}
static PyObject *Matr_oldsetFresnelMirrFac( BPy_Material * self,
PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setFresnelMirrFac );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setFresnelMirrFac );
}
static PyObject *Matr_oldsetFresnelTrans( BPy_Material * self,
PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setFresnelTrans );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setFresnelTrans );
}
static PyObject *Matr_oldsetFresnelTransFac( BPy_Material * self,
PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setFresnelTransFac );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setFresnelTransFac );
}
static PyObject *Matr_oldsetHaloSeed( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setHaloSeed );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setHaloSeed );
}
static PyObject *Matr_oldsetHaloSize( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setHaloSize );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setHaloSize );
}
static PyObject *Matr_oldsetHardness( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setHardness );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setHardness );
}
static PyObject *Matr_oldsetIOR( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setIOR );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setIOR );
}
static PyObject *Matr_oldsetName( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setName );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setName );
}
static PyObject *Matr_oldsetNFlares( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setNFlares );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setNFlares );
}
static PyObject *Matr_oldsetNLines( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setNLines );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setNLines );
}
static PyObject *Matr_oldsetNRings( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setNRings );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setNRings );
}
static PyObject *Matr_oldsetNStars( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setNStars );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setNStars );
}
static PyObject *Matr_oldsetRayMirr( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setRayMirr );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setRayMirr );
}
static PyObject *Matr_oldsetRoughness( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setRoughness );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setRoughness );
}
static PyObject *Matr_oldsetMirrDepth( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setMirrDepth );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setMirrDepth );
}
static PyObject *Matr_oldsetRef( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setRef );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setRef );
}
static PyObject *Matr_oldsetRefracIndex( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setRefracIndex );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setRefracIndex );
}
static PyObject *Matr_oldsetRms( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setRms );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setRms );
}
static PyObject *Matr_oldsetSpec( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setSpec );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setSpec );
}
static PyObject *Matr_oldsetSpecShader( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setSpecShader );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setSpecShader );
}
static PyObject *Matr_oldsetSpecSize( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setSpecSize );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setSpecSize );
}
static PyObject *Matr_oldsetSpecSmooth( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setSpecSmooth );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setSpecSmooth );
}
static PyObject *Matr_oldsetSpecTransp( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setSpecTransp );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setSpecTransp );
}
static PyObject *Matr_oldsetSubSize( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setSubSize );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setSubSize );
}
static PyObject *Matr_oldsetTranslucency( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setTranslucency );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setTranslucency );
}
static PyObject *Matr_oldsetTransDepth( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setTransDepth );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setTransDepth );
}
static PyObject *Matr_oldsetZOffset( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setZOffset );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setZOffset );
}
static PyObject *Matr_oldsetRGBCol( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setRGBCol );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setRGBCol );
}
static PyObject *Matr_oldsetSpecCol( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setSpecCol );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setSpecCol );
}
static PyObject *Matr_oldsetMirCol( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setMirCol );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setMirCol );
}
@@ -3034,14 +3034,14 @@
/* build tuple, call wrapper */
value = Py_BuildValue( "(i)", flag );
- error = EXPP_setterWrapper( (void *)self, value, (void *)Material_setMode );
+ error = EXPP_setterWrapper( (void *)self, value, (setter)Material_setMode );
Py_DECREF ( value );
return error;
}
static PyObject *Matr_oldsetIpo( BPy_Material * self, PyObject * args )
{
- return EXPP_setterWrapper( (void *)self, args, (void *)Material_setIpo );
+ return EXPP_setterWrapper( (void *)self, args, (setter)Material_setIpo );
}
/*
@@ -3054,7 +3054,7 @@
if( self->material->ipo ) {
PyObject *value = Py_BuildValue( "(O)", Py_None );
- EXPP_setterWrapper( (void *)self, value, (void *)Material_setIpo );
+ EXPP_setterWrapper( (void *)self, value, (setter)Material_setIpo );
Py_DECREF ( value );
return EXPP_incr_ret_True();
}

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
78/43/1eaa2920cda8cbc69360997bbbb1

Event Timeline