diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-12-03 17:58:08 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-03 17:58:08 +0400 |
commit | 4a9c522125df9321c8337eaaf1933f540140d023 (patch) | |
tree | 2000ce4c3251829a420724b8b9e4d382b0d8998c /source | |
parent | 6213c6d69b43d11153fca69a50508c93c67dd05a (diff) |
quiet float -> double conversion warnings and do some osl style edits.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/gpencil/editaction_gpencil.c | 2 | ||||
-rw-r--r-- | source/blender/editors/mask/mask_editaction.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/gpencil/editaction_gpencil.c b/source/blender/editors/gpencil/editaction_gpencil.c index 137ef50be3c..aee97f40c31 100644 --- a/source/blender/editors/gpencil/editaction_gpencil.c +++ b/source/blender/editors/gpencil/editaction_gpencil.c @@ -477,7 +477,7 @@ static short snap_gpf_nearestsec(bGPDframe *gpf, Scene *scene) { float secf = (float)FPS; if (gpf->flag & GP_FRAME_SELECT) - gpf->framenum = (int)(floor(gpf->framenum / secf + 0.5f) * secf); + gpf->framenum = (int)(floorf(gpf->framenum / secf + 0.5f) * secf); return 0; } diff --git a/source/blender/editors/mask/mask_editaction.c b/source/blender/editors/mask/mask_editaction.c index 1d2cb1f9ff3..707622fa841 100644 --- a/source/blender/editors/mask/mask_editaction.c +++ b/source/blender/editors/mask/mask_editaction.c @@ -265,7 +265,7 @@ static short snap_masklayer_nearestsec(MaskLayerShape *masklay_shape, Scene *sce { float secf = (float)FPS; if (masklay_shape->flag & MASK_SHAPE_SELECT) - masklay_shape->frame = (int)(floor(masklay_shape->frame / secf + 0.5f) * secf); + masklay_shape->frame = (int)(floorf(masklay_shape->frame / secf + 0.5f) * secf); return 0; } |