Commit: 3d286bd7a14d83a8c8417215b7e1ffdbb72dec0c
Author: Nicholas Bishop
Date: Sun Feb 8 17:58:16 2015 +0100
Branches: cycles-ptex-49
https://developer.blender.org/rB3d286bd7a14d83a8c8417215b7e1ffdbb72dec0c
Ptex+Cuda fix, use kernel_assert instead of assert
===================================================================
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 e99acff..0e02746 100644
--- a/intern/cycles/kernel/svm/svm_image.h
+++ b/intern/cycles/kernel/svm/svm_image.h
@@ -400,8 +400,8 @@ ccl_device void svm_node_tex_image(KernelGlobals *kg,
ShaderData *sd, float *sta
f = make_float4(1.0f, 0.0f, 1.0f, 1.0f);
}
else if (srgb & 2) {
- assert(co.x >= 0 && co.x <= 1);
- assert(co.y >= 0 && co.y <= 1);
+ kernel_assert(co.x >= 0 && co.x <= 1);
+ kernel_assert(co.y >= 0 && co.y <= 1);
// TODO: test hacks for Ptex
uint face_id = (uint)(co.z + 0.5f);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
