diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-07 20:06:17 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-07 20:06:17 +0400 |
| commit | d835d2f4e65ae3bf8e22f8d3d60e7e6ea7a6b4ca (patch) | |
| tree | 77475cb0eec4dda28415b6c9f6be51df28acf286 /intern/cycles/kernel/svm/svm_convert.h | |
| parent | c24be7ec6e5269c54552d1fb03707b97befd48d1 (diff) | |
Code cleanup: avoid some warnings due to implicit uint/int/float/double conversion.
Diffstat (limited to 'intern/cycles/kernel/svm/svm_convert.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_convert.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/svm/svm_convert.h b/intern/cycles/kernel/svm/svm_convert.h index f74915a4bc9..0050813e2c0 100644 --- a/intern/cycles/kernel/svm/svm_convert.h +++ b/intern/cycles/kernel/svm/svm_convert.h @@ -53,7 +53,7 @@ __device void svm_node_convert(ShaderData *sd, float *stack, uint type, uint fro } case NODE_CONVERT_VI: { float3 f = stack_load_float3(stack, from); - int i = (f.x + f.y + f.z)*(1.0f/3.0f); + int i = (int)((f.x + f.y + f.z)*(1.0f/3.0f)); stack_store_int(stack, to, i); break; } |