diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-12-26 17:19:25 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-12-26 17:19:25 +0300 |
commit | e4b20f0180858aaeec9f057e8cc473a01e1e5280 (patch) | |
tree | fe9e3629ff21435df7027634a91405397c4a9695 /source/blender/editors/space_view3d | |
parent | 63f84cf26d574284a30f2d28c57a6c32823f4425 (diff) |
2.5: various warning fixes. There was one actual bug in a few different
places, using sprintf with strings like ID names as the format string
(note that this name can contain a % character).
Diffstat (limited to 'source/blender/editors/space_view3d')
-rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 8 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_intern.h | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index a1d6a9d13cb..4e042d8ede5 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -3710,25 +3710,25 @@ static void tekenhandlesN(Nurb *nu, short sel) if( (bezt->f2 & SELECT)==sel) { fp= bezt->vec[0]; - cpack(col[bezt->h1]); + cpack(col[(int)bezt->h1]); glVertex3fv(fp); glVertex3fv(fp+3); - cpack(col[bezt->h2]); + cpack(col[(int)bezt->h2]); glVertex3fv(fp+3); glVertex3fv(fp+6); } else if( (bezt->f1 & SELECT)==sel) { fp= bezt->vec[0]; - cpack(col[bezt->h1]); + cpack(col[(int)bezt->h1]); glVertex3fv(fp); glVertex3fv(fp+3); } else if( (bezt->f3 & SELECT)==sel) { fp= bezt->vec[1]; - cpack(col[bezt->h2]); + cpack(col[(int)bezt->h2]); glVertex3fv(fp); glVertex3fv(fp+3); } diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index cb3ccf4b5df..e0b674678a6 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -42,6 +42,8 @@ struct EditFace; struct Nurb; struct BezTriple; struct BPoint; +struct bContext; +struct wmWindowManager; typedef struct ViewDepths { unsigned short w, h; |