diff options
author | Joshua Leung <aligorith@gmail.com> | 2009-02-10 12:18:04 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2009-02-10 12:18:04 +0300 |
commit | 3bcb1ebdfeb9cfb39abfcc9cc063001432f94975 (patch) | |
tree | 7f7d93ad03cf2025b5d18d55ab2ab6235b25b5fe /source/blender/editors/space_time | |
parent | 8243e65ed813842c21808c531bcc5f8cbb59c642 (diff) |
2.5: Silencing MSVC warnings in a few files (many files still have many to clean out some other day).
Diffstat (limited to 'source/blender/editors/space_time')
-rw-r--r-- | source/blender/editors/space_time/space_time.c | 8 | ||||
-rw-r--r-- | source/blender/editors/space_time/time_header.c | 20 |
2 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c index 5b36939a471..d28fdc7f371 100644 --- a/source/blender/editors/space_time/space_time.c +++ b/source/blender/editors/space_time/space_time.c @@ -93,8 +93,8 @@ static void time_draw_sfra_efra(const bContext *C, SpaceTime *stime, ARegion *ar UI_ThemeColorShade(TH_BACK, -25); if (PSFRA < PEFRA) { - glRectf(v2d->cur.xmin, v2d->cur.ymin, PSFRA, v2d->cur.ymax); - glRectf(PEFRA, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax); + glRectf(v2d->cur.xmin, v2d->cur.ymin, (float)PSFRA, v2d->cur.ymax); + glRectf((float)PEFRA, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax); } else { glRectf(v2d->cur.xmin, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax); @@ -102,8 +102,8 @@ static void time_draw_sfra_efra(const bContext *C, SpaceTime *stime, ARegion *ar UI_ThemeColorShade(TH_BACK, -60); /* thin lines where the actual frames are */ - fdrawline(PSFRA, v2d->cur.ymin, PSFRA, v2d->cur.ymax); - fdrawline(PEFRA, v2d->cur.ymin, PEFRA, v2d->cur.ymax); + fdrawline((float)PSFRA, v2d->cur.ymin, (float)PSFRA, v2d->cur.ymax); + fdrawline((float)PEFRA, v2d->cur.ymin, (float)PEFRA, v2d->cur.ymax); } /* add handlers, stuff you only do once or on area/region changes */ diff --git a/source/blender/editors/space_time/time_header.c b/source/blender/editors/space_time/time_header.c index e4acf052534..65946a4288b 100644 --- a/source/blender/editors/space_time/time_header.c +++ b/source/blender/editors/space_time/time_header.c @@ -469,28 +469,28 @@ void time_header_buttons(const bContext *C, ARegion *ar) if (scene->r.psfra) { uiDefButI(block, NUM, B_REDRAWALL,"Start:", - xco,yco, 4.5*XIC, YIC, + xco,yco, (int)4.5*XIC, YIC, &scene->r.psfra,MINFRAMEF, MAXFRAMEF, 0, 0, "The start frame of the animation preview (inclusive)"); - xco += (short)(4.5*XIC); + xco += (int)(4.5*XIC); uiDefButI(block, NUM, B_REDRAWALL,"End:", - xco,yco,4.5*XIC,YIC, - &scene->r.pefra,PSFRA,MAXFRAMEF, 0, 0, + xco,yco, (int)4.5*XIC,YIC, + &scene->r.pefra,(float)PSFRA, MAXFRAMEF, 0, 0, "The end frame of the animation preview (inclusive)"); } else { uiDefButI(block, NUM, B_REDRAWALL,"Start:", - xco,yco, 4.5*XIC, YIC, + xco,yco, (int)4.5*XIC, YIC, &scene->r.sfra,MINFRAMEF, MAXFRAMEF, 0, 0, "The start frame of the animation (inclusive)"); xco += (short)(4.5*XIC); uiDefButI(block, NUM, B_REDRAWALL,"End:", - xco,yco,4.5*XIC,YIC, - &scene->r.efra,(float)SFRA,MAXFRAMEF, 0, 0, + xco,yco, (int)4.5*XIC,YIC, + &scene->r.efra,(float)SFRA, MAXFRAMEF, 0, 0, "The end frame of the animation (inclusive)"); } uiBlockEndAlign(block); @@ -498,7 +498,7 @@ void time_header_buttons(const bContext *C, ARegion *ar) xco += (short)(4.5 * XIC + 16); uiDefButI(block, NUM, B_NEWFRAME, "", - xco,yco,3.5*XIC,YIC, + xco,yco, (int)3.5*XIC,YIC, &(scene->r.cfra), MINFRAMEF, MAXFRAMEF, 0, 0, "Displays Current Frame of animation"); @@ -532,7 +532,7 @@ void time_header_buttons(const bContext *C, ARegion *ar) if (scene->autokey_mode & AUTOKEY_ON) { uiDefButS(block, MENU, REDRAWINFO, "Auto-Keying Mode %t|Add/Replace Keys%x3|Replace Keys %x5", - xco, yco, 3.5*XIC, YIC, &(scene->autokey_mode), 0, 1, 0, 0, + xco, yco, (int)3.5*XIC, YIC, &(scene->autokey_mode), 0, 1, 0, 0, "Mode of automatic keyframe insertion for Objects and Bones"); xco+= (4*XIC); } @@ -553,7 +553,7 @@ void time_header_buttons(const bContext *C, ARegion *ar) /* always as last */ - UI_view2d_totRect_set(&ar->v2d, xco+XIC+80, ar->v2d.tot.ymax-ar->v2d.tot.ymin); + UI_view2d_totRect_set(&ar->v2d, xco+XIC+80, (int)(ar->v2d.tot.ymax-ar->v2d.tot.ymin)); uiEndBlock(C, block); uiDrawBlock(C, block); |