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-06 14:42:50 +0300
committerThomas Dinges <blender@dingto.org>2016-05-06 15:37:35 +0300
commit3807bcb3a845475ac938a331329d3fd92d90c3e4 (patch)
tree98fc2b7357cd7ac02c9e16317f4bc8ec8a4f9100 /intern/cycles/device/device_cuda.cpp
parent36d8a70b00c2c0a1bc28ffad4cc2e283a77d7bab (diff)
Cleanup: Rename texture slots to float4 and byte, to distinguish from future float (single channel) and half_float slots.
Should be no functional changes, tested CPU and CUDA.
Diffstat (limited to 'intern/cycles/device/device_cuda.cpp')
-rw-r--r--intern/cycles/device/device_cuda.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index f1a17d652da..f7c985e787d 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -483,7 +483,7 @@ public:
*/
vector<string> tokens;
string_split(tokens, name, "_");
- bind_name = string_printf("__tex_image_%s3d_%s",
+ bind_name = string_printf("__tex_image_%s_3d_%s",
tokens[2].c_str(),
tokens[3].c_str());
}