Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix a few compiler warnings with OS X / clang.

Browse Source
This commit is contained in:
Brecht Van Lommel
2016-04-17 00:51:29 +02:00
parent 667a5ef48e
commit 1dfbcd88d5
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/kernel/kernel_compat_cpu.h
View File

@@ -154,6 +154,7 @@ template<typename T> struct texture_image {
break;
default:
kernel_assert(0);
return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
}
return read(data[ix + iy*width]);
}
@@ -183,6 +184,7 @@ template<typename T> struct texture_image {
break;
default:
kernel_assert(0);
return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
}
float4 r = (1.0f - ty)*(1.0f - tx)*read(data[ix + iy*width]);
@@ -231,6 +233,7 @@ template<typename T> struct texture_image {
break;
default:
kernel_assert(0);
return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
}
const int xc[4] = {pix, ix, nix, nnix};
@@ -298,6 +301,7 @@ template<typename T> struct texture_image {
break;
default:
kernel_assert(0);
return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
}
return read(data[ix + iy*width + iz*width*height]);
@@ -335,6 +339,7 @@ template<typename T> struct texture_image {
break;
default:
kernel_assert(0);
return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
}
float4 r;
@@ -402,6 +407,7 @@ template<typename T> struct texture_image {
break;
default:
kernel_assert(0);
return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
}
const int xc[4] = {pix, ix, nix, nnix};