diff options
author | Joseph Gilbert <ascotan@gmail.com> | 2005-07-18 07:50:37 +0400 |
---|---|---|
committer | Joseph Gilbert <ascotan@gmail.com> | 2005-07-18 07:50:37 +0400 |
commit | e60291d39c0f77282a2d17f79e9264107bbc495e (patch) | |
tree | 274f6c0fc564553bb1484abfc5ad33e758d00903 /source/blender/python/api2_2x/CurNurb.c | |
parent | 9919df089dc34a62ac14f5c151d7815ee852bd81 (diff) |
Header file clean up and warning fixes
- Mostly this cleans up the #includes and header files in the python project.
- Warning fixes are mostly casting issues and misc fixes. General warning clean up.
- #include Python.h MUST come as the first include to avoid the POSIX redefine warning in the unix makefiles
- fno-strict-aliasing flag added to makefile to fix a unavoidable type punning warning in types.c
Diffstat (limited to 'source/blender/python/api2_2x/CurNurb.c')
-rw-r--r-- | source/blender/python/api2_2x/CurNurb.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/source/blender/python/api2_2x/CurNurb.c b/source/blender/python/api2_2x/CurNurb.c index bb69ef6f8b9..bb9fa25643b 100644 --- a/source/blender/python/api2_2x/CurNurb.c +++ b/source/blender/python/api2_2x/CurNurb.c @@ -29,14 +29,12 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ -#include "Python.h" -#include "DNA_curve_types.h" +#include "CurNurb.h" /*This must come first */ + #include "BKE_curve.h" #include "BDR_editcurve.h" /* for convertspline */ #include "MEM_guardedalloc.h" - #include "gen_utils.h" -#include "CurNurb.h" #include "BezTriple.h" @@ -593,7 +591,7 @@ static PyObject *CurNurb_setMatIndex( BPy_CurNurb * self, PyObject * args ) "expected integer argument" ) ); /* fixme: some range checking would be nice! */ - self->nurb->mat_nr = index; + self->nurb->mat_nr = (short)index; Py_INCREF( Py_None ); return Py_None; @@ -651,7 +649,7 @@ static PyObject *CurNurb_setFlagU( BPy_CurNurb * self, PyObject * args ) "expected integer argument" ) ); if( self->nurb->flagu != flagu ) { - self->nurb->flagu = flagu; + self->nurb->flagu = (short)flagu; makeknots( self->nurb, 1, self->nurb->flagu >> 1 ); } @@ -694,7 +692,7 @@ static PyObject *CurNurb_setFlagV( BPy_CurNurb * self, PyObject * args ) "expected integer argument" ) ); if( self->nurb->flagv != flagv ) { - self->nurb->flagv = flagv; + self->nurb->flagv = (short)flagv; makeknots( self->nurb, 2, self->nurb->flagv >> 1 ); } |