Commit: 574032a6d418df68bb1e2a0de82b969eabfe95b6
Author: Nicholas Bishop
Date: Sun Feb 8 17:45:06 2015 +0100
Branches: cycles-ptex-49
https://developer.blender.org/rB574032a6d418df68bb1e2a0de82b969eabfe95b6
Ptex+Cuda compilation fix
===================================================================
M intern/cycles/kernel/svm/svm_image.h
===================================================================
diff --git a/intern/cycles/kernel/svm/svm_image.h
b/intern/cycles/kernel/svm/svm_image.h
index 139c637..e99acff 100644
--- a/intern/cycles/kernel/svm/svm_image.h
+++ b/intern/cycles/kernel/svm/svm_image.h
@@ -404,7 +404,7 @@ ccl_device void svm_node_tex_image(KernelGlobals *kg,
ShaderData *sd, float *sta
assert(co.y >= 0 && co.y <= 1);
// TODO: test hacks for Ptex
- uint face_id = (uint)(co[2] + 0.5f);
+ uint face_id = (uint)(co.z + 0.5f);
uint offset = kernel_tex_fetch(__ptex_table, id - /* TODO */
1024);
float2 tex_size =
make_float2((float)kernel_tex_fetch(__ptex_table,
offset + 0),
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
