diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-08-06 10:38:52 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-06 10:38:52 +0400 |
commit | 81acaf5f15f5c1c5e5d34fed065939982912b189 (patch) | |
tree | 789ab74d7bca799c975abd692738325454eadb10 /source/blender/editors/space_view3d/drawvolume.c | |
parent | 34c64b8ea33236ae5b1fd3720defc73d08710e29 (diff) |
quiet double-promotion warnings, change octree.cpp to use a float (vector accumulated into a float anyway)
Diffstat (limited to 'source/blender/editors/space_view3d/drawvolume.c')
-rw-r--r-- | source/blender/editors/space_view3d/drawvolume.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c index 5ac6382bdbe..542ed7af0e6 100644 --- a/source/blender/editors/space_view3d/drawvolume.c +++ b/source/blender/editors/space_view3d/drawvolume.c @@ -461,7 +461,9 @@ void draw_smoke_volume(SmokeDomainSettings *sds, Object *ob, glTexCoord3d((points[i * 3 + 0] - min[0]) * cor[0] / size[0], (points[i * 3 + 1] - min[1]) * cor[1] / size[1], (points[i * 3 + 2] - min[2]) * cor[2] / size[2]); - glVertex3f(points[i * 3 + 0] / fabs(ob->size[0]), points[i * 3 + 1] / fabs(ob->size[1]), points[i * 3 + 2] / fabs(ob->size[2])); + glVertex3f(points[i * 3 + 0] / fabsf(ob->size[0]), + points[i * 3 + 1] / fabsf(ob->size[1]), + points[i * 3 + 2] / fabsf(ob->size[2])); } glEnd(); @@ -474,7 +476,9 @@ void draw_smoke_volume(SmokeDomainSettings *sds, Object *ob, glTexCoord3d((points[i * 3 + 0] - min[0]) * cor[0] / size[0], (points[i * 3 + 1] - min[1]) * cor[1] / size[1], (points[i * 3 + 2] - min[2]) * cor[2] / size[2]); - glVertex3f(points[i * 3 + 0] / fabs(ob->size[0]), points[i * 3 + 1] / fabs(ob->size[1]), points[i * 3 + 2] / fabs(ob->size[2])); + glVertex3f(points[i * 3 + 0] / fabsf(ob->size[0]), + points[i * 3 + 1] / fabsf(ob->size[1]), + points[i * 3 + 2] / fabsf(ob->size[2])); } glEnd(); } |