diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-08-01 01:49:10 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-08-01 01:49:10 +0400 |
| commit | 0d9364463f79652c8c879ac5524bc47ee822238c (patch) | |
| tree | db9b67e477e6b25182c74d672d5289aad710bffc /intern/cycles/kernel/svm | |
| parent | 2a25acb108feed74514d01517e1cb870c4d6851c (diff) | |
| parent | e48acb7decf9032c51208d7e55dd81279a3914dc (diff) | |
Merged revision(s) 58779, 58783-58784 from trunk/blender into soc-2013-dingto.
Diffstat (limited to 'intern/cycles/kernel/svm')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_vector_transform.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/svm/svm_vector_transform.h b/intern/cycles/kernel/svm/svm_vector_transform.h index 17dd72d4f30..a0d56d14dcf 100644 --- a/intern/cycles/kernel/svm/svm_vector_transform.h +++ b/intern/cycles/kernel/svm/svm_vector_transform.h @@ -35,8 +35,8 @@ __device void svm_node_vector_transform(KernelGlobals *kg, ShaderData *sd, float NodeVectorTransformConvertSpace to = (NodeVectorTransformConvertSpace)ito; Transform tfm; - int is_object = (sd->object != ~0); - int is_direction = (type == NODE_VECTOR_TRANSFORM_TYPE_VECTOR || type == NODE_VECTOR_TRANSFORM_TYPE_NORMAL); + bool is_object = (sd->object != ~0); + bool is_direction = (type == NODE_VECTOR_TRANSFORM_TYPE_VECTOR || type == NODE_VECTOR_TRANSFORM_TYPE_NORMAL); /* From world */ if(from == NODE_VECTOR_TRANSFORM_CONVERT_SPACE_WORLD) { |