Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Remove the OSL <UVTILE> workaround

Browse Source 
Partially reverts rB46ae0831134 now that we have a new version of
OSL/OIIO that supports <UVTILE> directly.

Differential Revision: https://developer.blender.org/D14851
This commit is contained in:
Jesse Yurkovich
2022-05-06 21:41:31 -07:00
parent 23be3294ff
commit 2a2261d7e1
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
intern/cycles/scene/shader_nodes.cpp
View File

@@ -19,7 +19,6 @@
#include "util/color.h" #include "util/color.h"
#include "util/foreach.h" #include "util/foreach.h"
#include "util/log.h" #include "util/log.h"
#include "util/string.h"
#include "util/transform.h" #include "util/transform.h"
#include "kernel/tables.h" #include "kernel/tables.h"
@@ -450,12 +449,8 @@ void ImageTextureNode::compile(OSLCompiler &compiler)
const ustring known_colorspace = metadata.colorspace; const ustring known_colorspace = metadata.colorspace;
if (handle.svm_slot() == -1) { 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( 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 { else {
compiler.parameter_texture("filename", handle.svm_slot()); compiler.parameter_texture("filename", handle.svm_slot());