Merge with trunk r39928
[blender-staging.git] / source / blender / blenlib / intern / BLI_kdtree.c
index 086777afca972b594b052755109023e23ba911f6..c906d507eb819e59105f32e4b62bf0450c1f59f0 100644 (file)
@@ -180,7 +180,7 @@ int BLI_kdtree_find_nearest(KDTree *tree, float *co, float *nor, KDTreeNearest *
 
                cur_dist = node->co[node->d] - co[node->d];
 
-               if(cur_dist<0.0){
+               if(cur_dist<0.0f){
                        cur_dist= -cur_dist*cur_dist;
 
                        if(-cur_dist<min_dist){
@@ -287,7 +287,7 @@ int BLI_kdtree_find_n_nearest(KDTree *tree, int n, float *co, float *nor, KDTree
 
                cur_dist = node->co[node->d] - co[node->d];
 
-               if(cur_dist<0.0){
+               if(cur_dist<0.0f){
                        cur_dist= -cur_dist*cur_dist;
 
                        if(found<n || -cur_dist<nearest[found-1].dist){