Revision: 36777 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36777 Author: blendix Date: 2011-05-19 11:54:03 +0000 (Thu, 19 May 2011) Log Message: ----------- Fix some compile warnings.
Modified Paths: -------------- trunk/blender/source/blender/blenkernel/intern/world.c trunk/blender/source/blender/imbuf/intern/png.c trunk/blender/source/blender/modifiers/intern/MOD_subsurf.c Modified: trunk/blender/source/blender/blenkernel/intern/world.c =================================================================== --- trunk/blender/source/blender/blenkernel/intern/world.c 2011-05-19 11:45:06 UTC (rev 36776) +++ trunk/blender/source/blender/blenkernel/intern/world.c 2011-05-19 11:54:03 UTC (rev 36777) @@ -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" Modified: trunk/blender/source/blender/imbuf/intern/png.c =================================================================== --- trunk/blender/source/blender/imbuf/intern/png.c 2011-05-19 11:45:06 UTC (rev 36776) +++ trunk/blender/source/blender/imbuf/intern/png.c 2011-05-19 11:54:03 UTC (rev 36777) @@ -391,7 +391,7 @@ 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) { Modified: trunk/blender/source/blender/modifiers/intern/MOD_subsurf.c =================================================================== --- trunk/blender/source/blender/modifiers/intern/MOD_subsurf.c 2011-05-19 11:45:06 UTC (rev 36776) +++ trunk/blender/source/blender/modifiers/intern/MOD_subsurf.c 2011-05-19 11:54:03 UTC (rev 36777) @@ -111,7 +111,7 @@ return result; } -static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob, +static DerivedMesh *applyModifierEM(ModifierData *md, Object *UNUSED(ob), struct EditMesh *UNUSED(editData), DerivedMesh *derivedData) { _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs