diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-02-27 11:31:10 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-02-27 11:31:10 +0300 |
commit | 2e5eb4152262adfc382860073dc5e73ced187e35 (patch) | |
tree | 3589c86b41a503b729c5a82462ad599a14fed4f3 /source/blender/blenkernel | |
parent | f73c993b16c4083f0c72b87ba3f70fa12a5077df (diff) |
pedantic warning cleanup, also remove texspace_edit() since its been added using a different method.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_customdata_file.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_mesh.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_modifier.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_report.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_scene.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/action.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/customdata_file.c | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh_validate.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/nla.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/scene.c | 2 |
11 files changed, 17 insertions, 17 deletions
diff --git a/source/blender/blenkernel/BKE_customdata_file.h b/source/blender/blenkernel/BKE_customdata_file.h index f97565f23a1..030d46fc1a6 100644 --- a/source/blender/blenkernel/BKE_customdata_file.h +++ b/source/blender/blenkernel/BKE_customdata_file.h @@ -44,12 +44,12 @@ void cdf_free(CDataFile *cdf); int cdf_read_open(CDataFile *cdf, char *filename); int cdf_read_layer(CDataFile *cdf, CDataFileLayer *blay); -int cdf_read_data(CDataFile *cdf, int size, void *data); +int cdf_read_data(CDataFile *cdf, unsigned int size, void *data); void cdf_read_close(CDataFile *cdf); int cdf_write_open(CDataFile *cdf, char *filename); int cdf_write_layer(CDataFile *cdf, CDataFileLayer *blay); -int cdf_write_data(CDataFile *cdf, int size, void *data); +int cdf_write_data(CDataFile *cdf, unsigned int size, void *data); void cdf_write_close(CDataFile *cdf); void cdf_remove(char *filename); diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index 0f5780ed5b0..4a7e14f7d7d 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -156,7 +156,7 @@ int mesh_center_bounds(struct Mesh *me, float cent[3]); void mesh_translate(struct Mesh *me, float offset[3], int do_keys); /* mesh_validate.c */ -int BKE_mesh_validate_arrays(struct Mesh *me, struct MVert *mverts, int totvert, struct MEdge *medges, int totedge, struct MFace *mfaces, int totface, const short do_verbose, const short do_fixes); +int BKE_mesh_validate_arrays(struct Mesh *me, struct MVert *mverts, unsigned int totvert, struct MEdge *medges, unsigned int totedge, struct MFace *mfaces, unsigned int totface, const short do_verbose, const short do_fixes); int BKE_mesh_validate(struct Mesh *me, int do_verbose); int BKE_mesh_validate_dm(struct DerivedMesh *dm); diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index af625ae9d9c..648e67cad8a 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -305,7 +305,7 @@ int modifier_sameTopology(ModifierData *md); int modifier_isEnabled(struct Scene *scene, struct ModifierData *md, int required_mode); void modifier_setError(struct ModifierData *md, const char *format, ...) #ifdef __GNUC__ -__attribute__ ((format (printf, 2, 3))); +__attribute__ ((format (printf, 2, 3))) #endif ; diff --git a/source/blender/blenkernel/BKE_report.h b/source/blender/blenkernel/BKE_report.h index 397c96422a5..253f3ea9ac1 100644 --- a/source/blender/blenkernel/BKE_report.h +++ b/source/blender/blenkernel/BKE_report.h @@ -51,7 +51,7 @@ void BKE_reports_clear(ReportList *reports); void BKE_report(ReportList *reports, ReportType type, const char *message); void BKE_reportf(ReportList *reports, ReportType type, const char *format, ...) #ifdef __GNUC__ -__attribute__ ((format (printf, 3, 4))); +__attribute__ ((format (printf, 3, 4))) #endif ; diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h index ac85f91bf46..aa057e22d20 100644 --- a/source/blender/blenkernel/BKE_scene.h +++ b/source/blender/blenkernel/BKE_scene.h @@ -78,7 +78,7 @@ int scene_camera_switch_update(struct Scene *scene); char *scene_find_marker_name(struct Scene *scene, int frame); char *scene_find_last_marker_name(struct Scene *scene, int frame); -int scene_marker_tfm_translate(struct Scene *scene, int delta, int flag); +int scene_marker_tfm_translate(struct Scene *scene, int delta, unsigned int flag); int scene_marker_tfm_extend(struct Scene *scene, int delta, int flag, int frame, char side); int scene_marker_tfm_scale(struct Scene *scene, float value, int flag); diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index 14a0f71f824..d4c9c5dd221 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -1066,7 +1066,7 @@ void copy_pose_result(bPose *to, bPose *from) bPoseChannel *pchanto, *pchanfrom; if(to==NULL || from==NULL) { - printf("pose result copy error to:%p from:%p\n", to, from); // debug temp + printf("pose result copy error to:%p from:%p\n", (void *)to, (void *)from); // debug temp return; } diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index 77d0f008c2b..817aa57071a 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -304,7 +304,7 @@ void action_move_fcurves_by_basepath (bAction *srcAct, bAction *dstAct, const ch if ELEM3(NULL, srcAct, dstAct, basepath) { if (G.f & G_DEBUG) { printf("ERROR: action_partition_fcurves_by_basepath(%p, %p, %p) has insufficient info to work with\n", - srcAct, dstAct, basepath); + (void *)srcAct, (void *)dstAct, (void *)basepath); } return; } diff --git a/source/blender/blenkernel/intern/customdata_file.c b/source/blender/blenkernel/intern/customdata_file.c index 6fb79a0df28..0407e7b2b85 100644 --- a/source/blender/blenkernel/intern/customdata_file.c +++ b/source/blender/blenkernel/intern/customdata_file.c @@ -310,11 +310,11 @@ int cdf_read_layer(CDataFile *cdf, CDataFileLayer *blay) return (fseek(cdf->readf, offset, SEEK_SET) == 0); } -int cdf_read_data(CDataFile *cdf, int size, void *data) +int cdf_read_data(CDataFile *cdf, unsigned int size, void *data) { float *fdata; - int a; - + unsigned int a; + /* read data */ if(!fread(data, size, 1, cdf->readf)) return 0; @@ -385,7 +385,7 @@ int cdf_write_layer(CDataFile *UNUSED(cdf), CDataFileLayer *UNUSED(blay)) return 1; } -int cdf_write_data(CDataFile *cdf, int size, void *data) +int cdf_write_data(CDataFile *cdf, unsigned int size, void *data) { /* write data */ if(!fwrite(data, size, 1, cdf->writef)) diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c index 8b0b7a041dc..f2da2c39b93 100644 --- a/source/blender/blenkernel/intern/mesh_validate.c +++ b/source/blender/blenkernel/intern/mesh_validate.c @@ -112,7 +112,7 @@ static int search_face_cmp(const void *v1, const void *v2) } -int BKE_mesh_validate_arrays(Mesh *me, MVert *UNUSED(mverts), int totvert, MEdge *medges, int totedge, MFace *mfaces, int totface, const short do_verbose, const short do_fixes) +int BKE_mesh_validate_arrays(Mesh *me, MVert *UNUSED(mverts), unsigned int totvert, MEdge *medges, unsigned int totedge, MFace *mfaces, unsigned int totface, const short do_verbose, const short do_fixes) { # define PRINT if(do_verbose) printf # define REMOVE_EDGE_TAG(_med) { _med->v2= _med->v1; do_edge_free= 1; } @@ -122,7 +122,7 @@ int BKE_mesh_validate_arrays(Mesh *me, MVert *UNUSED(mverts), int totvert, MEdge MEdge *med; MFace *mf; MFace *mf_prev; - int i; + unsigned int i; int do_face_free= FALSE; int do_edge_free= FALSE; @@ -134,7 +134,7 @@ int BKE_mesh_validate_arrays(Mesh *me, MVert *UNUSED(mverts), int totvert, MEdge SortFace *sort_faces= MEM_callocN(sizeof(SortFace) * totface, "search faces"); SortFace *sf; SortFace *sf_prev; - int totsortface= 0; + unsigned int totsortface= 0; BLI_assert(!(do_fixes && me == NULL)); diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index df012c47f66..b7e01fca8b0 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -1494,7 +1494,7 @@ short BKE_nla_tweakmode_enter (AnimData *adt) if ELEM3(NULL, activeTrack, activeStrip, activeStrip->act) { if (G.f & G_DEBUG) { printf("NLA tweakmode enter - neither active requirement found \n"); - printf("\tactiveTrack = %p, activeStrip = %p \n", activeTrack, activeStrip); + printf("\tactiveTrack = %p, activeStrip = %p \n", (void *)activeTrack, (void *)activeStrip); } return 0; } diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 1611116f0af..d84640fe3cd 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -829,7 +829,7 @@ char *scene_find_last_marker_name(Scene *scene, int frame) /* markers need transforming from different parts of the code so have * a generic function to do this */ -int scene_marker_tfm_translate(Scene *scene, int delta, int flag) +int scene_marker_tfm_translate(Scene *scene, int delta, unsigned int flag) { TimeMarker *marker; int tot= 0; |