[Bf-blender-cvs] [fe47163a1e] master: Cycles: Fix CUDA compilation error after recent changes

Sergey Sharybin noreply at git.blender.org
Wed Feb 15 15:05:21 CET 2017


Commit: fe47163a1eb9db8c977e6aad7711d3e585387e17
Author: Sergey Sharybin
Date:   Wed Feb 15 15:01:08 2017 +0100
Branches: master
https://developer.blender.org/rBfe47163a1eb9db8c977e6aad7711d3e585387e17

Cycles: Fix CUDA compilation error after recent changes

===================================================================

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 2afdf61b47..0d6efb4722 100644
--- a/intern/cycles/kernel/svm/svm_image.h
+++ b/intern/cycles/kernel/svm/svm_image.h
@@ -144,7 +144,6 @@ ccl_device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y,
 		case 86: r = kernel_tex_image_interp(__tex_image_byte4_086, x, y); break;
 		case 87: r = kernel_tex_image_interp(__tex_image_byte4_087, x, y); break;
 		case 88: r = kernel_tex_image_interp(__tex_image_byte4_088, x, y); break;
-		case 89: r = kernel_tex_image_interp(__tex_image_byte4_089, x, y); break;
 		default:
 			kernel_assert(0);
 			return make_float4(0.0f, 0.0f, 0.0f, 0.0f);




More information about the Bf-blender-cvs mailing list