archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: (float)floor -> floorf

Browse Source
This commit is contained in:
Campbell Barton
2014-10-10 00:23:06 +02:00
parent 0f6afddb04
commit a00b6d1271
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenfont/intern/blf_glyph.c
View File

@@ -379,7 +379,7 @@ static void blf_texture3_draw(const float shadow_col[4], float uv[2][2], float x
static void blf_glyph_calc_rect(rctf *rect, GlyphBLF *g, float x, float y) static void blf_glyph_calc_rect(rctf *rect, GlyphBLF *g, float x, float y)
{ {
rect->xmin = (float)floor(x + g->pos_x); rect->xmin = floorf(x + g->pos_x);
rect->xmax = rect->xmin + (float)g->width; rect->xmax = rect->xmin + (float)g->width;
rect->ymin = y + g->pos_y; rect->ymin = y + g->pos_y;
rect->ymax = y + g->pos_y - (float)g->height; rect->ymax = y + g->pos_y - (float)g->height;

2
source/blender/editors/animation/keyframes_edit.c
View File

@@ -643,7 +643,7 @@ static short snap_bezier_nearestsec(KeyframeEditData *ked, BezTriple *bezt)
const float secf = (float)FPS; const float secf = (float)FPS;
if (bezt->f2 & SELECT) if (bezt->f2 & SELECT)
bezt->vec[1][0] = ((float)floor(bezt->vec[1][0] / secf + 0.5f) * secf); bezt->vec[1][0] = (floorf(bezt->vec[1][0] / secf + 0.5f) * secf);
return 0; return 0;
} }

4
source/blender/editors/transform/transform_conversions.c
View File

@@ -2773,8 +2773,8 @@ void flushTransUVs(TransInfo *t)
td->loc2d[1] = td->loc[1] * invy; td->loc2d[1] = td->loc[1] * invy;
if ((sima->flag & SI_PIXELSNAP) && (t->state != TRANS_CANCEL)) { if ((sima->flag & SI_PIXELSNAP) && (t->state != TRANS_CANCEL)) {
td->loc2d[0] = (float)floor(width * td->loc2d[0] + 0.5f) / width; td->loc2d[0] = floorf(width * td->loc2d[0] + 0.5f) / width;
td->loc2d[1] = (float)floor(height * td->loc2d[1] + 0.5f) / height; td->loc2d[1] = floorf(height * td->loc2d[1] + 0.5f) / height;
} }
} }
} }

6
source/blender/editors/transform/transform_snap.c
View File

@@ -2396,7 +2396,7 @@ bool snapNodesContext(bContext *C, const int mval[2], float *r_dist_px, float r_
/*================================================================*/ /*================================================================*/
static void applyGridIncrement(TransInfo *t, float *val, int max_index, float fac[3], GearsType action); static void applyGridIncrement(TransInfo *t, float *val, int max_index, const float fac[3], GearsType action);
void snapGridIncrementAction(TransInfo *t, float *val, GearsType action) void snapGridIncrementAction(TransInfo *t, float *val, GearsType action)
@@ -2429,7 +2429,7 @@ void snapGridIncrement(TransInfo *t, float *val)
} }
static void applyGridIncrement(TransInfo *t, float *val, int max_index, float fac[3], GearsType action) static void applyGridIncrement(TransInfo *t, float *val, int max_index, const float fac[3], GearsType action)
{ {
int i; int i;
float asp[3] = {1.0f, 1.0f, 1.0f}; // TODO: Remove hard coded limit here (3) float asp[3] = {1.0f, 1.0f, 1.0f}; // TODO: Remove hard coded limit here (3)
@@ -2457,6 +2457,6 @@ static void applyGridIncrement(TransInfo *t, float *val, int max_index, float fa
} }
for (i = 0; i <= max_index; i++) { for (i = 0; i <= max_index; i++) {
val[i] = fac[action] * asp[i] * (float)floor(val[i] / (fac[action] * asp[i]) + 0.5f); val[i] = fac[action] * asp[i] * floorf(val[i] / (fac[action] * asp[i]) + 0.5f);
} }
} }