Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Gilbert <ascotan@gmail.com>2005-07-18 07:50:37 +0400
committerJoseph Gilbert <ascotan@gmail.com>2005-07-18 07:50:37 +0400
commite60291d39c0f77282a2d17f79e9264107bbc495e (patch)
tree274f6c0fc564553bb1484abfc5ad33e758d00903 /source/blender/python/api2_2x/Ipocurve.c
parent9919df089dc34a62ac14f5c151d7815ee852bd81 (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/Ipocurve.c')
-rw-r--r--source/blender/python/api2_2x/Ipocurve.c32
1 files changed, 12 insertions, 20 deletions
diff --git a/source/blender/python/api2_2x/Ipocurve.c b/source/blender/python/api2_2x/Ipocurve.c
index 51adfba192f..5d244c89726 100644
--- a/source/blender/python/api2_2x/Ipocurve.c
+++ b/source/blender/python/api2_2x/Ipocurve.c
@@ -30,21 +30,15 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#include "Ipocurve.h"
-
-#include <BKE_main.h>
-#include <BKE_global.h>
-#include <BKE_object.h>
-#include <BKE_library.h>
-#include <BKE_ipo.h>
-#include <BLI_blenlib.h>
-#include <BSE_editipo.h>
-#include <MEM_guardedalloc.h>
-#include <DNA_ipo_types.h>
-
-#include "constant.h"
-#include "gen_utils.h"
+#include "Ipocurve.h" /*This must come first*/
+
+#include "BKE_global.h"
+#include "BKE_ipo.h"
+#include "BSE_editipo.h"
+#include "MEM_guardedalloc.h"
+#include "DNA_ipo_types.h"
#include "BezTriple.h"
+#include "gen_utils.h"
/*****************************************************************************/
/* Python API function prototypes for the IpoCurve module. */
@@ -219,7 +213,7 @@ static PyObject *IpoCurve_setInterpolation( C_IpoCurve * self,
return ( EXPP_ReturnPyObjError
( PyExc_TypeError, "bad interpolation type" ) );
- self->ipocurve->ipo = id;
+ self->ipocurve->ipo = (short)id;
Py_INCREF( Py_None );
return Py_None;
}
@@ -262,7 +256,7 @@ static PyObject *IpoCurve_setExtrapolation( C_IpoCurve * self,
if( id == -1 )
return ( EXPP_ReturnPyObjError
( PyExc_TypeError, "bad interpolation type" ) );
- self->ipocurve->extrap = id;
+ self->ipocurve->extrap = (short)id;
Py_INCREF( Py_None );
return Py_None;
}
@@ -297,8 +291,8 @@ static PyObject *IpoCurve_addBezier( C_IpoCurve * self, PyObject * args )
return ( EXPP_ReturnPyObjError
( PyExc_TypeError, "expected tuple argument" ) );
- x = PyFloat_AsDouble( PyTuple_GetItem( popo, 0 ) );
- y = PyFloat_AsDouble( PyTuple_GetItem( popo, 1 ) );
+ x = (float)PyFloat_AsDouble( PyTuple_GetItem( popo, 0 ) );
+ y = (float)PyFloat_AsDouble( PyTuple_GetItem( popo, 1 ) );
icu = self->ipocurve;
npoints = icu->totvert;
tmp = icu->bezt;
@@ -445,8 +439,6 @@ static PyObject *IpoCurve_getName( C_IpoCurve * self )
return EXPP_ReturnPyObjError( PyExc_TypeError,
"This function doesn't support this ipocurve type yet" );
}
-
- return PyString_FromString( "" );
}
static void IpoCurveDeAlloc( C_IpoCurve * self )