diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-19 15:54:03 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-19 15:54:03 +0400 |
| commit | e088f592bd82f5c3863368f49eabd3e8afffe119 (patch) | |
| tree | 167c00f8e6367eccc70c7492068e8544d0864cc2 /source/blender | |
| parent | 417b7836ece014bdabd1493e2c06ea6ed530e939 (diff) | |
Fix some compile warnings.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/world.c | 1 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/png.c | 2 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_subsurf.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c index 8cecad97902..d413177873f 100644 --- a/source/blender/blenkernel/intern/world.c +++ b/source/blender/blenkernel/intern/world.c @@ -43,6 +43,7 @@ #include "DNA_scene_types.h" #include "DNA_texture_types.h" +#include "BLI_listbase.h" #include "BLI_utildefines.h" #include "BKE_world.h" diff --git a/source/blender/imbuf/intern/png.c b/source/blender/imbuf/intern/png.c index 6b6dcdb88af..f0c06ec0ae7 100644 --- a/source/blender/imbuf/intern/png.c +++ b/source/blender/imbuf/intern/png.c @@ -391,7 +391,7 @@ struct ImBuf *imb_loadpng(unsigned char *mem, size_t size, int flags) if (png_get_valid (png_ptr, info_ptr, PNG_INFO_pHYs)) { int unit_type; - unsigned int xres, yres; + png_uint_32 xres, yres; if(png_get_pHYs(png_ptr, info_ptr, &xres, &yres, &unit_type)) if(unit_type == PNG_RESOLUTION_METER) { diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c index e3e09f660aa..f780721ca07 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.c +++ b/source/blender/modifiers/intern/MOD_subsurf.c @@ -111,7 +111,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, return result; } -static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob, +static DerivedMesh *applyModifierEM(ModifierData *md, Object *UNUSED(ob), struct EditMesh *UNUSED(editData), DerivedMesh *derivedData) { |