diff options
Diffstat (limited to 'source/blender/blenkernel/intern/pbvh.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/pbvh.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/pbvh.cc b/source/blender/blenkernel/intern/pbvh.cc index 70aeb10f087..03382de34db 100644 --- a/source/blender/blenkernel/intern/pbvh.cc +++ b/source/blender/blenkernel/intern/pbvh.cc @@ -29,8 +29,6 @@ #include "PIL_time.h" -#include "GPU_buffers.h" - #include "bmesh.h" #include "atomic_ops.h" @@ -63,7 +61,7 @@ template<typename T> void to_float(const T &src, float dst[4]); template<> void to_float(const MLoopCol &src, float dst[4]) { - rgba_uchar_to_float(dst, reinterpret_cast<const unsigned char *>(&src)); + rgba_uchar_to_float(dst, reinterpret_cast<const uchar *>(&src)); srgb_to_linearrgb_v3_v3(dst, dst); } template<> void to_float(const MPropCol &src, float dst[4]) @@ -78,7 +76,7 @@ template<> void from_float(const float src[4], MLoopCol &dst) float temp[4]; linearrgb_to_srgb_v3_v3(temp, src); temp[3] = src[3]; - rgba_float_to_uchar(reinterpret_cast<unsigned char *>(&dst), temp); + rgba_float_to_uchar(reinterpret_cast<uchar *>(&dst), temp); } template<> void from_float(const float src[4], MPropCol &dst) { @@ -112,7 +110,7 @@ static void pbvh_vertex_color_get(const PBVH &pbvh, PBVHVertRef vertex, float r_ } if (count) { - mul_v4_fl(r_color, 1.0f / (float)count); + mul_v4_fl(r_color, 1.0f / float(count)); } } else { |