[Bf-blender-cvs] [b565bff] temp-cycles-microdisplacement: Remove extra image texture from kernel_textures.h

Mai Lavelle noreply at git.blender.org
Fri Jun 24 19:26:35 CEST 2016


Commit: b565bffaea44529c5a06c8ff2f29fdfd888db1ae
Author: Mai Lavelle
Date:   Sun Jun 12 09:37:21 2016 -0400
Branches: temp-cycles-microdisplacement
https://developer.blender.org/rBb565bffaea44529c5a06c8ff2f29fdfd888db1ae

Remove extra image texture from kernel_textures.h

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

M	intern/cycles/kernel/kernel_textures.h

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

diff --git a/intern/cycles/kernel/kernel_textures.h b/intern/cycles/kernel/kernel_textures.h
index c7f1433..ae4bb39 100644
--- a/intern/cycles/kernel/kernel_textures.h
+++ b/intern/cycles/kernel/kernel_textures.h
@@ -178,7 +178,6 @@ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_088)
 KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_089)
 KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_090)
 KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_091)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_092)
 
 #  else
 /* bindless textures */




More information about the Bf-blender-cvs mailing list