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/windowTheme.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/windowTheme.c')
-rw-r--r-- | source/blender/python/api2_2x/windowTheme.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/python/api2_2x/windowTheme.c b/source/blender/python/api2_2x/windowTheme.c index 7ee6cd80a1c..32e59ddaee6 100644 --- a/source/blender/python/api2_2x/windowTheme.c +++ b/source/blender/python/api2_2x/windowTheme.c @@ -30,10 +30,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ -#include <MEM_guardedalloc.h> -#include <BLI_blenlib.h> -#include <DNA_screen_types.h> -#include "windowTheme.h" +#include "windowTheme.h" /*This must come first*/ + +#include "BLI_blenlib.h" +#include "MEM_guardedalloc.h" #include "charRGBA.h" #include "gen_utils.h" @@ -241,7 +241,7 @@ static int ThemeSpace_setAttr( BPy_ThemeSpace * self, char *name, "expected integer value" ); val = ( int ) PyInt_AsLong( value ); - tsp->vertex_size = EXPP_ClampInt( val, + tsp->vertex_size = (char)EXPP_ClampInt( val, EXPP_THEME_VTX_SIZE_MIN, EXPP_THEME_VTX_SIZE_MAX ); ret = 0; @@ -254,7 +254,7 @@ static int ThemeSpace_setAttr( BPy_ThemeSpace * self, char *name, "expected integer value" ); val = ( int ) PyInt_AsLong( value ); - tsp->vertex_size = EXPP_ClampInt( val, + tsp->vertex_size = (char)EXPP_ClampInt( val, EXPP_THEME_FDOT_SIZE_MIN, EXPP_THEME_FDOT_SIZE_MAX ); ret = 0; @@ -415,7 +415,7 @@ static int ThemeUI_setAttr( BPy_ThemeUI * self, char *name, PyObject * value ) "expected integer value" ); val = ( int ) PyInt_AsLong( value ); - tui->but_drawtype = EXPP_ClampInt( val, + tui->but_drawtype = (char)EXPP_ClampInt( val, EXPP_THEME_DRAWTYPE_MIN, EXPP_THEME_DRAWTYPE_MAX ); ret = 0; |