diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-03 22:29:11 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-03 22:29:11 +0400 |
commit | 2996f08f845c4b67b0231d5832668da5ddb2d227 (patch) | |
tree | 419f3dbd78a19398883a405606f7a7de83084d90 /intern/cycles/bvh | |
parent | 170f8c8c4109afb366bac0f385d9e2f59af6c8e2 (diff) |
Cycles: first batch of windows build fixes, not quite there yet.
Diffstat (limited to 'intern/cycles/bvh')
-rw-r--r-- | intern/cycles/bvh/bvh.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/bvh/bvh.h | 2 | ||||
-rw-r--r-- | intern/cycles/bvh/bvh_build.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/bvh/bvh.cpp b/intern/cycles/bvh/bvh.cpp index ab230794774..664bdd98b1f 100644 --- a/intern/cycles/bvh/bvh.cpp +++ b/intern/cycles/bvh/bvh.cpp @@ -467,7 +467,7 @@ void RegularBVH::refit_nodes() assert(!params.top_level); BoundBox bbox; - refit_node(0, pack.is_leaf[0], bbox); + refit_node(0, (pack.is_leaf[0])? true: false, bbox); } void RegularBVH::refit_node(int idx, bool leaf, BoundBox& bbox) diff --git a/intern/cycles/bvh/bvh.h b/intern/cycles/bvh/bvh.h index acc25291da3..6b877594422 100644 --- a/intern/cycles/bvh/bvh.h +++ b/intern/cycles/bvh/bvh.h @@ -26,7 +26,7 @@ CCL_NAMESPACE_BEGIN class BVHNode; -class BVHStackEntry; +struct BVHStackEntry; class BVHParams; class BoundBox; class CacheData; diff --git a/intern/cycles/bvh/bvh_build.cpp b/intern/cycles/bvh/bvh_build.cpp index 6a9cc915f01..3e47cb75014 100644 --- a/intern/cycles/bvh/bvh_build.cpp +++ b/intern/cycles/bvh/bvh_build.cpp @@ -359,8 +359,8 @@ BVHBuild::SpatialSplit BVHBuild::find_spatial_split(const NodeSpec& spec, float const Reference& ref = references[refIdx]; float3 firstBinf = (ref.bounds.min - origin) * invBinSize; float3 lastBinf = (ref.bounds.max - origin) * invBinSize; - int3 firstBin = make_int3(firstBinf.x, firstBinf.y, firstBinf.z); - int3 lastBin = make_int3(lastBinf.x, lastBinf.y, lastBinf.z); + int3 firstBin = make_int3((int)firstBinf.x, (int)firstBinf.y, (int)firstBinf.z); + int3 lastBin = make_int3((int)lastBinf.x, (int)lastBinf.y, (int)lastBinf.z); firstBin = clamp(firstBin, 0, BVHParams::NUM_SPATIAL_BINS - 1); lastBin = clamp(lastBin, firstBin, BVHParams::NUM_SPATIAL_BINS - 1); |