[Bf-blender-cvs] [5da418d4e6a] master: Fix Cycles build error without Embree on Windows
Brecht Van Lommel
noreply at git.blender.org
Mon Mar 1 16:33:36 CET 2021
Commit: 5da418d4e6a199ae5ebe0cfd5b088369fb2d755b
Author: Brecht Van Lommel
Date: Mon Mar 1 16:28:55 2021 +0100
Branches: master
https://developer.blender.org/rB5da418d4e6a199ae5ebe0cfd5b088369fb2d755b
Fix Cycles build error without Embree on Windows
Don't use ssize_t, it's not available in MSVC.
===================================================================
M intern/cycles/bvh/bvh_binning.cpp
===================================================================
diff --git a/intern/cycles/bvh/bvh_binning.cpp b/intern/cycles/bvh/bvh_binning.cpp
index d51143c578e..1cc38275d11 100644
--- a/intern/cycles/bvh/bvh_binning.cpp
+++ b/intern/cycles/bvh/bvh_binning.cpp
@@ -107,9 +107,9 @@ BVHObjectBinning::BVHObjectBinning(const BVHRange &job,
/* map geometry to bins, unrolled once */
{
- ssize_t i;
+ int64_t i;
- for (i = 0; i < ssize_t(size()) - 1; i += 2) {
+ for (i = 0; i < int64_t(size()) - 1; i += 2) {
prefetch_L2(&prims[start() + i + 8]);
/* map even and odd primitive to bin */
@@ -146,7 +146,7 @@ BVHObjectBinning::BVHObjectBinning(const BVHRange &job,
}
/* for uneven number of primitives */
- if (i < ssize_t(size())) {
+ if (i < int64_t(size())) {
/* map primitive to bin */
const BVHReference &prim0 = prims[start() + i];
BoundBox bounds0 = get_prim_bounds(prim0);
@@ -237,7 +237,7 @@ void BVHObjectBinning::split(BVHReference *prims,
BoundBox lcent_bounds = BoundBox::empty;
BoundBox rcent_bounds = BoundBox::empty;
- ssize_t l = 0, r = N - 1;
+ int64_t l = 0, r = N - 1;
while (l <= r) {
prefetch_L2(&prims[start() + l + 8]);
More information about the Bf-blender-cvs
mailing list