diff options
author | Jesse Yurkovich <jesse.y@gmail.com> | 2022-05-07 07:41:31 +0300 |
---|---|---|
committer | Jesse Yurkovich <jesse.y@gmail.com> | 2022-05-07 07:41:31 +0300 |
commit | 2a2261d7e1933a1f5cfe478dbf109888c91697e8 (patch) | |
tree | 0a1a8b1fcd0f56eb43183c65d8ed73ca68bdc7db /intern/cycles/scene | |
parent | 23be3294ff50b9a1f9eebfbde71b44252520c51f (diff) |
Cleanup: Remove the OSL <UVTILE> workaround
Partially reverts rB46ae0831134 now that we have a new version of
OSL/OIIO that supports <UVTILE> directly.
Differential Revision: https://developer.blender.org/D14851
Diffstat (limited to 'intern/cycles/scene')
-rw-r--r-- | intern/cycles/scene/shader_nodes.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/intern/cycles/scene/shader_nodes.cpp b/intern/cycles/scene/shader_nodes.cpp index 06a2052d4cb..9a61a8a753b 100644 --- a/intern/cycles/scene/shader_nodes.cpp +++ b/intern/cycles/scene/shader_nodes.cpp @@ -19,7 +19,6 @@ #include "util/color.h" #include "util/foreach.h" #include "util/log.h" -#include "util/string.h" #include "util/transform.h" #include "kernel/tables.h" @@ -450,12 +449,8 @@ void ImageTextureNode::compile(OSLCompiler &compiler) const ustring known_colorspace = metadata.colorspace; if (handle.svm_slot() == -1) { - /* OIIO currently does not support <UVTILE> substitutions natively. Replace with a format they - * understand. */ - std::string osl_filename = filename.string(); - string_replace(osl_filename, "<UVTILE>", "<U>_<V>"); compiler.parameter_texture( - "filename", ustring(osl_filename), compress_as_srgb ? u_colorspace_raw : known_colorspace); + "filename", filename, compress_as_srgb ? u_colorspace_raw : known_colorspace); } else { compiler.parameter_texture("filename", handle.svm_slot()); |