griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Jesse Yurkovich
2024-07-09 12:07:15 -07:00
parent 5665243bef 7cc0e48882
commit 3c65b154eb
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/nodes/shader/nodes/node_shader_tex_image.cc
View File

@@ -235,14 +235,31 @@ NODE_SHADER_MATERIALX_BEGIN
BLI_assert_unreachable();
}
NodeItem::Type node_type = NodeItem::Type::Color4;
const char *node_colorspace = nullptr;
const char *image_colorspace = image->colorspace_settings.name;
if (IMB_colormanagement_space_name_is_data(image_colorspace)) {
node_type = NodeItem::Type::Vector4;
}
else if (IMB_colormanagement_space_name_is_scene_linear(image_colorspace)) {
node_colorspace = "lin_rec709";
}
else if (IMB_colormanagement_space_name_is_srgb(image_colorspace)) {
node_colorspace = "srgb_texture";
}
res = create_node("image",
NodeItem::Type::Color4,
node_type,
{{"texcoord", vector},
{"filtertype", val(filtertype)},
{"uaddressmode", val(addressmode)},
{"vaddressmode", val(addressmode)}});
res.set_input("file", image_path, NodeItem::Type::Filename);
res.node->setName(image_node_name);
if (node_colorspace) {
res.node->setAttribute("colorspace", node_colorspace);
}
}
}