Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2013-05-13 19:31:59 +0400
committerThomas Dinges <blender@dingto.org>2013-05-13 19:31:59 +0400
commitd76b758f23974020f5cb4bd21825224de4d8d9c4 (patch)
tree6547576e831376df6e32c1820017980b71d7f292 /intern
parentd4c6ac9a60aa3c945fe9fa2d726b7434674832b0 (diff)
Cycles:
* Fix compile error, when building with __KERNEL_SSE__
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/util/util_boundbox.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/util/util_boundbox.h b/intern/cycles/util/util_boundbox.h
index 3ee35b992f7..abb8d8688d8 100644
--- a/intern/cycles/util/util_boundbox.h
+++ b/intern/cycles/util/util_boundbox.h
@@ -69,7 +69,7 @@ public:
__forceinline void grow(const float3& pt, float border)
{
- float3 shift = {border, border, border, 0.0f};
+ float3 shift = make_float3(border, border, border);
min = ccl::min(pt - shift, min);
max = ccl::max(pt + shift, max);
}
@@ -93,7 +93,7 @@ public:
__forceinline void grow_safe(const float3& pt, float border)
{
if(isfinite(pt.x) && isfinite(pt.y) && isfinite(pt.z) && isfinite(border)) {
- float3 shift = {border, border, border, 0.0f};
+ float3 shift = make_float3(border, border, border);
min = ccl::min(pt - shift, min);
max = ccl::max(pt + shift, max);
}