diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-08-19 20:21:29 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-08-19 20:21:29 +0400 |
commit | 3a81f23e0975ea87ade780965462ad5b15b39d95 (patch) | |
tree | c0dd7aa326b81598626f6c248bf71063187c715b /source/blender/editors/object/object_bake.c | |
parent | 2c1182664cb65e760742ed43fa840cd241d74b4a (diff) |
warning cleanup for -Wdouble-promotion
Diffstat (limited to 'source/blender/editors/object/object_bake.c')
-rw-r--r-- | source/blender/editors/object/object_bake.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c index 679e4e58017..ee162464c70 100644 --- a/source/blender/editors/object/object_bake.c +++ b/source/blender/editors/object/object_bake.c @@ -636,14 +636,14 @@ static void apply_heights_data(void *bake_data) if(ibuf->rect_float) { float *rrgbf= ibuf->rect_float + i*4; - if(max-min > 1e-5) height= (heights[i]-min)/(max-min); + if(max-min > 1e-5f) height= (heights[i]-min)/(max-min); else height= 0; rrgbf[0]=rrgbf[1]=rrgbf[2]= height; } else { char *rrgb= (char*)ibuf->rect + i*4; - if(max-min > 1e-5) height= (heights[i]-min)/(max-min); + if(max-min > 1e-5f) height= (heights[i]-min)/(max-min); else height= 0; rrgb[0]=rrgb[1]=rrgb[2]= FTOCHAR(height); |