Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2016-05-09 03:22:01 +0300
committerThomas Dinges <blender@dingto.org>2016-05-09 03:22:01 +0300
commit9a1e11260c667dce5df123c2b451d119d8c05a7b (patch)
treeebe69d91a9c2853fe82e88697fc6108a69f302b0 /intern/cycles/kernel/kernels
parent5fe1bea2daecd7670a6a7688a24432e9dce96802 (diff)
Cleanup: More byte -> byte4 renaming for consistency.
Diffstat (limited to 'intern/cycles/kernel/kernels')
-rw-r--r--intern/cycles/kernel/kernels/cpu/kernel.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernels/cpu/kernel.cpp b/intern/cycles/kernel/kernels/cpu/kernel.cpp
index 5fa95f29613..c0a333ab18c 100644
--- a/intern/cycles/kernel/kernels/cpu/kernel.cpp
+++ b/intern/cycles/kernel/kernels/cpu/kernel.cpp
@@ -106,9 +106,9 @@ void kernel_tex_copy(KernelGlobals *kg,
tex->extension = extension;
}
}
- else if(strstr(name, "__tex_image_byte")) {
+ else if(strstr(name, "__tex_image_byte4")) {
texture_image_uchar4 *tex = NULL;
- int id = atoi(name + strlen("__tex_image_byte_"));
+ int id = atoi(name + strlen("__tex_image_byte4_"));
int array_index = id - MAX_FLOAT4_IMAGES;
if(array_index >= 0 && array_index < MAX_BYTE_IMAGES) {