diff options
Diffstat (limited to 'source/blender/python')
23 files changed, 106 insertions, 46 deletions
diff --git a/source/blender/python/BPY_interface.c b/source/blender/python/BPY_interface.c index e6f71ac8bb4..e1028d75475 100644 --- a/source/blender/python/BPY_interface.c +++ b/source/blender/python/BPY_interface.c @@ -113,6 +113,10 @@ PyObject *importText( char *name ); void init_ourImport( void ); PyObject *blender_import( PyObject * self, PyObject * args ); +int BPY_txt_do_python_Text( struct Text *text ); +void BPY_Err_Handle( char *script_name ); +PyObject *traceback_getFilename( PyObject * tb ); + /**************************************************************************** * Description: This function will initialise Python and all the implemented * api variations. @@ -848,7 +852,7 @@ void BPY_free_finished_script( Script * script ) return; } -void unlink_script( Script * script ) +static void unlink_script( Script * script ) { /* copied from unlink_text in drawtext.c */ bScreen *scr; ScrArea *area; @@ -1095,7 +1099,7 @@ void BPY_free_scriptlink( struct ScriptLink *slink ) return; } -int CheckAllScriptsFromList( ListBase * list, Text * text ) +static int CheckAllScriptsFromList( ListBase * list, Text * text ) { ID *id; ScriptLink *scriptlink; diff --git a/source/blender/python/api2_2x/Blender.c b/source/blender/python/api2_2x/Blender.c index b677f09413e..7c93d540ceb 100644 --- a/source/blender/python/api2_2x/Blender.c +++ b/source/blender/python/api2_2x/Blender.c @@ -79,6 +79,9 @@ static PyObject *Blender_Load( PyObject * self, PyObject * args ); static PyObject *Blender_Save( PyObject * self, PyObject * args ); static PyObject *Blender_UpdateMenus( PyObject * self); +extern PyObject *Text3d_Init( void ); /* missing in some include */ + + /*****************************************************************************/ /* The following string definitions are used for documentation strings. */ /* In Python these will be written to the console when doing a */ diff --git a/source/blender/python/api2_2x/Bone.c b/source/blender/python/api2_2x/Bone.c index 5a3a2d014e1..686b791a846 100644 --- a/source/blender/python/api2_2x/Bone.c +++ b/source/blender/python/api2_2x/Bone.c @@ -233,7 +233,7 @@ PyObject *Bone_Init( void ) //--------------- Bone module internal callbacks----------------- //--------------- updatePyBone------------------------------------ -int updatePyBone( BPy_Bone * self ) +static int updatePyBone( BPy_Bone * self ) { int x, y; char *parent_str = ""; @@ -1691,7 +1691,7 @@ static PyObject *Bone_getRestMatrix( BPy_Bone * self, PyObject * args ) //use python vars if( BLI_streq( local, worldspace ) ) { VecSubf( delta, self->tail->vec, self->head->vec ); - make_boneMatrixvr( *( ( MatrixObject * ) matrix )-> + make_boneMatrixvr( (float ( * )[4]) *( ( MatrixObject * ) matrix )-> matrix, delta, self->roll ); } else if( BLI_streq( local, bonespace ) ) { return ( EXPP_ReturnPyObjError( PyExc_AttributeError, @@ -1701,12 +1701,12 @@ static PyObject *Bone_getRestMatrix( BPy_Bone * self, PyObject * args ) //use bone datastruct if( BLI_streq( local, worldspace ) ) { get_objectspace_bone_matrix( self->bone, - *( ( MatrixObject * ) + ( float ( * )[4] ) *( ( MatrixObject * ) matrix )->matrix, 1, 1 ); } else if( BLI_streq( local, bonespace ) ) { VecSubf( delta, self->bone->tail, self->bone->head ); - make_boneMatrixvr( *( ( MatrixObject * ) matrix )-> + make_boneMatrixvr( (float ( * )[4]) *( ( MatrixObject * ) matrix )-> matrix, delta, self->bone->roll ); if( self->bone->parent ) { get_bone_root_pos( self->bone, root, 1 ); diff --git a/source/blender/python/api2_2x/Build.c b/source/blender/python/api2_2x/Build.c index a5c4c34219b..9cd9502cdeb 100644 --- a/source/blender/python/api2_2x/Build.c +++ b/source/blender/python/api2_2x/Build.c @@ -43,6 +43,9 @@ #include <stdio.h> +/* prototypes */ +PyObject *Build_Init( void ); + /*****************************************************************************/ /* Python BPy_Build methods table: */ /*****************************************************************************/ diff --git a/source/blender/python/api2_2x/Camera.c b/source/blender/python/api2_2x/Camera.c index ae9b07e9b45..5db45ad16e9 100644 --- a/source/blender/python/api2_2x/Camera.c +++ b/source/blender/python/api2_2x/Camera.c @@ -120,6 +120,9 @@ static PyObject *Camera_getScriptLinks( BPy_Camera * self, PyObject * args ); static PyObject *Camera_addScriptLink( BPy_Camera * self, PyObject * args ); static PyObject *Camera_clearScriptLinks( BPy_Camera * self ); +Camera *GetCameraByName( char *name ); + + /*****************************************************************************/ /* Python BPy_Camera methods table: */ /*****************************************************************************/ diff --git a/source/blender/python/api2_2x/Ipo.c b/source/blender/python/api2_2x/Ipo.c index 3ff60b65886..80a0a39ef5f 100644 --- a/source/blender/python/api2_2x/Ipo.c +++ b/source/blender/python/api2_2x/Ipo.c @@ -456,7 +456,7 @@ static PyObject *Ipo_getNcurves( BPy_Ipo * self ) stiv 6-jan-2004 */ -int Ipo_laIcuName( char *s, int *param ) +static int Ipo_laIcuName( char *s, int *param ) { int ok = 0; if( !strcmp( s, "Energy" ) ) { @@ -502,7 +502,7 @@ int Ipo_laIcuName( char *s, int *param ) return ok; } -int Ipo_woIcuName( char *s, int *param ) +static int Ipo_woIcuName( char *s, int *param ) { int ok = 0; if( !strcmp( s, "HorR" ) ) { @@ -572,7 +572,7 @@ int Ipo_woIcuName( char *s, int *param ) return ok; } -int Ipo_maIcuName( char *s, int *param ) +static int Ipo_maIcuName( char *s, int *param ) { int ok = 0; if( !strcmp( s, "R" ) ) { @@ -682,7 +682,7 @@ int Ipo_maIcuName( char *s, int *param ) return ok; } -int Ipo_keIcuName( char *s, int *param ) +static int Ipo_keIcuName( char *s, int *param ) { char key[10]; int ok = 0; @@ -703,7 +703,7 @@ int Ipo_keIcuName( char *s, int *param ) return ok; } -int Ipo_seqIcuName( char *s, int *param ) +static int Ipo_seqIcuName( char *s, int *param ) { int ok = 0; if( !strcmp( s, "Fac" ) ) { @@ -714,7 +714,7 @@ int Ipo_seqIcuName( char *s, int *param ) return ok; } -int Ipo_cuIcuName( char *s, int *param ) +static int Ipo_cuIcuName( char *s, int *param ) { int ok = 0; if( !strcmp( s, "Speed" ) ) { @@ -725,7 +725,7 @@ int Ipo_cuIcuName( char *s, int *param ) return ok; } -int Ipo_coIcuName( char *s, int *param ) +static int Ipo_coIcuName( char *s, int *param ) { int ok = 0; if( !strcmp( s, "Inf" ) ) { @@ -736,7 +736,7 @@ int Ipo_coIcuName( char *s, int *param ) return ok; } -int Ipo_acIcuName( char *s, int *param ) +static int Ipo_acIcuName( char *s, int *param ) { int ok = 0; if( !strcmp( s, "LocX" ) ) { @@ -782,7 +782,7 @@ int Ipo_acIcuName( char *s, int *param ) return ok; } -int Ipo_caIcuName( char *s, int *param ) +static int Ipo_caIcuName( char *s, int *param ) { int ok = 0; if( !strcmp( s, "Lens" ) ) { @@ -800,7 +800,7 @@ int Ipo_caIcuName( char *s, int *param ) return ok; } -int Ipo_texIcuName( char *s, int *param ) +static int Ipo_texIcuName( char *s, int *param ) { int ok = 0; if( !strcmp( s, "NSize" ) ) { @@ -891,7 +891,7 @@ int Ipo_texIcuName( char *s, int *param ) return ok; } -int Ipo_obIcuName( char *s, int *param ) +static int Ipo_obIcuName( char *s, int *param ) { int ok = 0; if( !strcmp( s, "LocX" ) ) { diff --git a/source/blender/python/api2_2x/Library.c b/source/blender/python/api2_2x/Library.c index a8edd6c147b..0b72b732d25 100644 --- a/source/blender/python/api2_2x/Library.c +++ b/source/blender/python/api2_2x/Library.c @@ -65,6 +65,10 @@ static PyObject *M_Library_Datablocks( PyObject * self, PyObject * args ); static PyObject *M_Library_Load( PyObject * self, PyObject * args ); static PyObject *M_Library_LinkableGroups( PyObject * self ); +PyObject *Library_Init( void ); +void EXPP_Library_Close( void ); + + /** * Module doc strings. */ diff --git a/source/blender/python/api2_2x/Material.c b/source/blender/python/api2_2x/Material.c index 90a78a5f60a..b633066401e 100644 --- a/source/blender/python/api2_2x/Material.c +++ b/source/blender/python/api2_2x/Material.c @@ -161,6 +161,10 @@ static PyObject *M_Material_New( PyObject * self, PyObject * args, PyObject * keywords ); static PyObject *M_Material_Get( PyObject * self, PyObject * args ); +/* Not exposed nor used */ +Material *GetMaterialByName( char *name ); + + /*****************************************************************************/ /* The following string definitions are used for documentation strings. */ /* In Python these will be written to the console when doing a */ diff --git a/source/blender/python/api2_2x/NMesh.c b/source/blender/python/api2_2x/NMesh.c index ba7729267fa..b1173799aa8 100644 --- a/source/blender/python/api2_2x/NMesh.c +++ b/source/blender/python/api2_2x/NMesh.c @@ -377,7 +377,7 @@ static int NMCol_setattr( PyObject * self, char *name, PyObject * v ) return 0; } -PyObject *NMCol_repr( BPy_NMCol * self ) +static PyObject *NMCol_repr( BPy_NMCol * self ) { static char s[256]; sprintf( s, "[NMCol - <%d, %d, %d, %d>]", self->r, self->g, self->b, @@ -2362,7 +2362,7 @@ static int check_validFaceUV( BPy_NMesh * nmesh ) } /* this is a copy of unlink_mesh in mesh.c, because ... */ -void EXPP_unlink_mesh( Mesh * me ) +static void EXPP_unlink_mesh( Mesh * me ) { int a; diff --git a/source/blender/python/api2_2x/NMesh.h b/source/blender/python/api2_2x/NMesh.h index 3041f9f0447..19b02cf6249 100644 --- a/source/blender/python/api2_2x/NMesh.h +++ b/source/blender/python/api2_2x/NMesh.h @@ -64,10 +64,10 @@ struct BPy_Object; /* These are from blender/src/editdeform.c, should be declared elsewhere, * maybe in BIF_editdeform.h, after proper testing of vgrouping methods XXX */ -void create_dverts( Mesh * me ); -void add_vert_defnr( Object * ob, int def_nr, int vertnum, float weight, +extern void create_dverts( Mesh * me ); +extern void add_vert_defnr( Object * ob, int def_nr, int vertnum, float weight, int assignmode ); -void remove_vert_def_nr( Object * ob, int def_nr, int vertnum ); +extern void remove_vert_def_nr( Object * ob, int def_nr, int vertnum ); diff --git a/source/blender/python/api2_2x/Noise.c b/source/blender/python/api2_2x/Noise.c index 15e830ae580..8182201d076 100644 --- a/source/blender/python/api2_2x/Noise.c +++ b/source/blender/python/api2_2x/Noise.c @@ -59,6 +59,8 @@ static int left = 1; static int initf = 0; static unsigned long *next; +PyObject *Noise_Init(void); + /* initializes state[N] with a seed */ static void init_genrand( unsigned long s ) { @@ -603,7 +605,7 @@ static PyMethodDef NoiseMethods[] = { /*----------------------------------------------------------------------*/ -PyObject *Noise_Init( ) +PyObject *Noise_Init(void) { PyObject *NoiseTypes, *DistanceMetrics, *md = diff --git a/source/blender/python/api2_2x/Object.c b/source/blender/python/api2_2x/Object.c index 649b545ae57..638afb49eae 100644 --- a/source/blender/python/api2_2x/Object.c +++ b/source/blender/python/api2_2x/Object.c @@ -63,6 +63,10 @@ static PyObject *M_Object_New( PyObject * self, PyObject * args ); PyObject *M_Object_Get( PyObject * self, PyObject * args ); static PyObject *M_Object_GetSelected( PyObject * self, PyObject * args ); +extern int Text3d_CheckPyObject( PyObject * py_obj ); +extern struct Text3d *Text3d_FromPyObject( PyObject * py_obj ); + + /*****************************************************************************/ /* The following string definitions are used for documentation strings. */ /* In Python these will be written to the console when doing a */ @@ -908,7 +912,7 @@ static PyObject *Object_getInverseMatrix( BPy_Object * self ) { MatrixObject *inverse = ( MatrixObject * ) newMatrixObject( NULL, 4, 4 ); - Mat4Invert( *inverse->matrix, self->object->obmat ); + Mat4Invert( (float ( * )[4])*inverse->matrix, self->object->obmat ); return ( ( PyObject * ) inverse ); } @@ -968,14 +972,14 @@ static PyObject *Object_getMatrix( BPy_Object * self, PyObject * args ) disable_where_script( 1 ); where_is_object( self->object ); disable_where_script( 0 ); - Mat4CpyMat4( *( ( MatrixObject * ) matrix )->matrix, + Mat4CpyMat4((float ( * )[4]) *( ( MatrixObject * ) matrix )->matrix, self->object->obmat ); } else if( BLI_streq( space, "localspace" ) ) { /* Localspace matrix */ object_to_mat4( self->object, - *( ( MatrixObject * ) matrix )->matrix ); + ( float ( * )[4] ) *( ( MatrixObject * ) matrix )->matrix ); /* old behavior, prior to 2.34, check this method's doc string: */ } else if( BLI_streq( space, "old_worldspace" ) ) { - Mat4CpyMat4( *( ( MatrixObject * ) matrix )->matrix, + Mat4CpyMat4( (float ( * )[4]) *( ( MatrixObject * ) matrix )->matrix, self->object->obmat ); } else { return ( EXPP_ReturnPyObjError( PyExc_RuntimeError, diff --git a/source/blender/python/api2_2x/Particle.c b/source/blender/python/api2_2x/Particle.c index c080bc5df93..6d8c0edc8f5 100644 --- a/source/blender/python/api2_2x/Particle.c +++ b/source/blender/python/api2_2x/Particle.c @@ -124,6 +124,9 @@ static PyMethodDef BPy_Particle_methods[] = { {NULL, NULL, 0, NULL} }; +/**************** prototypes ********************/ +PyObject *Particle_Init( void ); + /*****************************************************************************/ /* Python Particle_Type structure definition: */ diff --git a/source/blender/python/api2_2x/Sound.c b/source/blender/python/api2_2x/Sound.c index eb8b5094b58..86857ee453b 100644 --- a/source/blender/python/api2_2x/Sound.c +++ b/source/blender/python/api2_2x/Sound.c @@ -153,9 +153,12 @@ static PyMethodDef BPy_Sound_methods[] = { "() - play this sound"}, {"setCurrent", ( PyCFunction ) Sound_setCurrent, METH_NOARGS, "() - make this the active sound in the sound buttons win (also redraws)"}, - //{"reload", ( PyCFunction ) Sound_setCurrent, METH_NOARGS, - //"() - reload this Sound object's sample.\n\ -//This is only useful if the original sound file has changed."}, + +/* + {"reload", ( PyCFunction ) Sound_setCurrent, METH_NOARGS, + "() - reload this Sound object's sample.\n\ + This is only useful if the original sound file has changed."}, +*/ SOUND_FLOAT_METHOD_FUNCS( Volume ) SOUND_FLOAT_METHOD_FUNCS( Attenuation ) SOUND_FLOAT_METHOD_FUNCS( Pitch ) diff --git a/source/blender/python/api2_2x/Sys.c b/source/blender/python/api2_2x/Sys.c index 2d8ae8febfc..5af539ac881 100644 --- a/source/blender/python/api2_2x/Sys.c +++ b/source/blender/python/api2_2x/Sys.c @@ -37,6 +37,7 @@ #include <sys/stat.h> #include "gen_utils.h" +#include "Sys.h" /*****************************************************************************/ /* Python API function prototypes for the sys module. */ diff --git a/source/blender/python/api2_2x/Text3d.c b/source/blender/python/api2_2x/Text3d.c index aee86f20f63..59e62c644b7 100644 --- a/source/blender/python/api2_2x/Text3d.c +++ b/source/blender/python/api2_2x/Text3d.c @@ -34,6 +34,8 @@ #include "DNA_view3d_types.h" #include "DNA_vfont_types.h" +#include "MEM_guardedalloc.h" + #include "BKE_object.h" #include "BDR_editobject.h" #include "BKE_displist.h" @@ -140,8 +142,13 @@ struct PyMethodDef M_Text3d_methods[] = { /*****************************************************************************/ /* Python BPy_Text3d methods declarations: */ +/* extern prototypes */ /*****************************************************************************/ -static PyObject *Text2Text3d( BPy_Text3d * self, PyObject * args ); +/*static PyObject *Text2Text3d( BPy_Text3d * self, PyObject * args );*/ /*unused nor defined*/ +extern void freedisplist(struct ListBase *lb); +extern VFont *get_builtin_font(void); +int Text3d_CheckPyObject( PyObject * py_obj ); +struct Text3d *Text3d_FromPyObject( PyObject * py_obj ); /* @@ -326,7 +333,7 @@ struct Text3d *Text3d_FromPyObject( PyObject * py_obj ) BPy_Text3d *blen_obj; blen_obj = ( BPy_Text3d * ) py_obj; - return ((Text3d*) blen_obj->curve ); + return ((struct Text3d*) blen_obj->curve ); } static PyObject *Text3d_getName( BPy_Text3d * self ) diff --git a/source/blender/python/api2_2x/Wave.c b/source/blender/python/api2_2x/Wave.c index 2b73c025251..fecc3d0d4a4 100644 --- a/source/blender/python/api2_2x/Wave.c +++ b/source/blender/python/api2_2x/Wave.c @@ -33,6 +33,8 @@ #include "Wave.h" #include "Effect.h" +/******* prototypes **********/ +PyObject *Wave_Init( void ); /*****************************************************************************/ /* Python BPy_Wave methods table: */ diff --git a/source/blender/python/api2_2x/Window.c b/source/blender/python/api2_2x/Window.c index b8be06e4db2..9543bdd2034 100644 --- a/source/blender/python/api2_2x/Window.c +++ b/source/blender/python/api2_2x/Window.c @@ -108,6 +108,8 @@ static PyObject *M_Window_GetScreens( PyObject * self ); static PyObject *M_Window_SetScreen( PyObject * self, PyObject * args ); static PyObject *M_Window_GetScreenInfo( PyObject * self, PyObject * args, PyObject * kwords ); +PyObject *Window_Init( void ); + /*****************************************************************************/ /* The following string definitions are used for documentation strings. */ diff --git a/source/blender/python/api2_2x/logic.c b/source/blender/python/api2_2x/logic.c index c48039aab4b..3ab543c2750 100644 --- a/source/blender/python/api2_2x/logic.c +++ b/source/blender/python/api2_2x/logic.c @@ -150,7 +150,7 @@ int updateProperyData( BPy_Property * self ) } //--------------- checkValidData_ptr-------------------------------- -int checkValidData_ptr( BPy_Property * self ) +static int checkValidData_ptr( BPy_Property * self ) { int length; //test pointer to see if data was removed (oops) diff --git a/source/blender/python/api2_2x/matrix.c b/source/blender/python/api2_2x/matrix.c index 33dc4da49b6..82391c0c9e5 100644 --- a/source/blender/python/api2_2x/matrix.c +++ b/source/blender/python/api2_2x/matrix.c @@ -341,7 +341,7 @@ PyObject *Matrix_Invert( MatrixObject * self ) self->matrix[2][0], self->matrix[2][1], self->matrix[2][2] ); } else if( self->rowSize == 4 ) { - det = Det4x4( *self->matrix ); + det = Det4x4( (float ( * )[4]) *self->matrix ); } else { return EXPP_ReturnPyObjError( PyExc_StandardError, "error calculating determinant for inverse()\n" ); @@ -370,7 +370,7 @@ PyObject *Matrix_Invert( MatrixObject * self ) ( PyExc_MemoryError, "problem allocating mat\n\n" ) ); } - Mat3Adj( ( float ( * )[3] ) mat, *self->matrix ); + Mat3Adj( ( float ( * )[3] ) mat,( float ( * )[3] ) *self->matrix ); } else if( self->rowSize == 4 ) { mat = PyMem_Malloc( self->rowSize * self->colSize * sizeof( float ) ); @@ -379,7 +379,7 @@ PyObject *Matrix_Invert( MatrixObject * self ) ( PyExc_MemoryError, "problem allocating mat\n\n" ) ); } - Mat4Adj( ( float ( * )[4] ) mat, *self->matrix ); + Mat4Adj( ( float ( * )[4] ) mat, ( float ( * )[4] ) *self->matrix ); } //divide by determinate for( x = 0; x < ( self->rowSize * self->colSize ); x++ ) { @@ -437,7 +437,7 @@ PyObject *Matrix_Determinant( MatrixObject * self ) self->matrix[2][0], self->matrix[2][1], self->matrix[2][2] ); } else if( self->rowSize == 4 ) { - det = Det4x4( *self->matrix ); + det = Det4x4( (float ( * )[4]) *self->matrix ); } else { return EXPP_ReturnPyObjError( PyExc_StandardError, "error in determinant()\n" ); @@ -458,9 +458,9 @@ PyObject *Matrix_Transpose( MatrixObject * self ) self->matrix[1][0] = self->matrix[0][1]; self->matrix[0][1] = t; } else if( self->rowSize == 3 ) { - Mat3Transp( *self->matrix ); + Mat3Transp( (float ( * )[3])*self->matrix ); } else if( self->rowSize == 4 ) { - Mat4Transp( *self->matrix ); + Mat4Transp( (float ( * )[4])*self->matrix ); } else return ( EXPP_ReturnPyObjError( PyExc_TypeError, "unable to transpose matrix\n" ) ); @@ -492,9 +492,9 @@ PyObject *Matrix_Identity( MatrixObject * self ) self->matrix[1][0] = 0.0f; self->matrix[1][1] = 1.0f; } else if( self->rowSize == 3 ) { - Mat3One( *self->matrix ); + Mat3One( ( float ( * )[3] ) *self->matrix ); } else if( self->rowSize == 4 ) { - Mat4One( *self->matrix ); + Mat4One( ( float ( * )[4] ) *self->matrix ); } else return ( EXPP_ReturnPyObjError( PyExc_TypeError, "unable to create identity matrix\n" ) ); @@ -668,7 +668,7 @@ static int Matrix_len( MatrixObject * self ) return ( self->colSize * self->rowSize ); } -PyObject *Matrix_add( PyObject * m1, PyObject * m2 ) +static PyObject *Matrix_add( PyObject * m1, PyObject * m2 ) { float *mat; int matSize, rowSize, colSize, x, y; @@ -710,7 +710,7 @@ PyObject *Matrix_add( PyObject * m1, PyObject * m2 ) return newMatrixObject( mat, rowSize, colSize ); } -PyObject *Matrix_sub( PyObject * m1, PyObject * m2 ) +static PyObject *Matrix_sub( PyObject * m1, PyObject * m2 ) { float *mat; int matSize, rowSize, colSize, x, y; @@ -752,7 +752,7 @@ PyObject *Matrix_sub( PyObject * m1, PyObject * m2 ) return newMatrixObject( mat, rowSize, colSize ); } -PyObject *Matrix_mul( PyObject * m1, PyObject * m2 ) +static PyObject *Matrix_mul( PyObject * m1, PyObject * m2 ) { PyObject *retval; int matSizeV, rowSizeV, colSizeV, rowSizeW, colSizeW, matSizeW, x, y,z; @@ -830,7 +830,7 @@ PyObject *Matrix_mul( PyObject * m1, PyObject * m2 ) } //coercion of unknown types to type MatrixObject for numeric protocols -int Matrix_coerce( PyObject ** m1, PyObject ** m2 ) +static int Matrix_coerce( PyObject ** m1, PyObject ** m2 ) { long *tempI; double *tempF; diff --git a/source/blender/python/api2_2x/quat.c b/source/blender/python/api2_2x/quat.c index e87050b29ea..35ef90aca2d 100644 --- a/source/blender/python/api2_2x/quat.c +++ b/source/blender/python/api2_2x/quat.c @@ -64,6 +64,13 @@ struct PyMethodDef Quaternion_methods[] = { {NULL, NULL, 0, NULL} }; +/* ****** prototypes ********** */ +PyObject *Quaternion_add( PyObject * q1, PyObject * q2 ); +PyObject *Quaternion_sub( PyObject * q1, PyObject * q2 ); +PyObject *Quaternion_mul( PyObject * q1, PyObject * q2 ); +int Quaternion_coerce( PyObject ** q1, PyObject ** q2 ); + + /*****************************/ // Quaternion Python Object /*****************************/ diff --git a/source/blender/python/api2_2x/sceneRender.c b/source/blender/python/api2_2x/sceneRender.c index bcfb495b238..70d0c676dcd 100644 --- a/source/blender/python/api2_2x/sceneRender.c +++ b/source/blender/python/api2_2x/sceneRender.c @@ -893,7 +893,7 @@ PyObject *RenderData_Play( BPy_RenderData * self ) if( self->renderContext->imtype == R_QUICKTIME ) { strcpy( file, self->renderContext->pic ); - BLI_convertstringcode( file, self->scene, + BLI_convertstringcode( file, (char *) self->scene, self->renderContext->cfra ); RE_make_existing_file( file ); if( strcasecmp( file + strlen( file ) - 4, ".mov" ) ) { diff --git a/source/blender/python/api2_2x/vector.c b/source/blender/python/api2_2x/vector.c index d7b2f8c8f74..9e65de3c46d 100644 --- a/source/blender/python/api2_2x/vector.c +++ b/source/blender/python/api2_2x/vector.c @@ -55,6 +55,14 @@ struct PyMethodDef Vector_methods[] = { {NULL, NULL, 0, NULL} }; +/******prototypes*************/ +PyObject *Vector_add( PyObject * v1, PyObject * v2 ); +PyObject *Vector_sub( PyObject * v1, PyObject * v2 ); +PyObject *Vector_mul( PyObject * v1, PyObject * v2 ); +PyObject *Vector_div( PyObject * v1, PyObject * v2 ); +int Vector_coerce( PyObject ** v1, PyObject ** v2 ); + + /*****************************/ // Vector Python Object /*****************************/ |