DagerD/blender
1
1
Fork 0
forked from blender/blender
Code Pull Requests Activity

Export other channels and parameters from texture nodes #16

Merged
Bogdan Nagirniak merged 8 commits from BogdanNagirniak/blender:matx-images-alpha-1 into matx-export-material 2023-09-08 18:28:56 +02:00
Conversation 0 Commits 8 Files Changed 7 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dd0fc02330 - Show all commits

4
source/blender/nodes/shader/materialx/nodes/tex_checker.cc
View File

@ -15,8 +15,8 @@ NodeItem TexCheckerNodeParser::compute()
NodeItem value1 = val(1.0f); NodeItem value1 = val(1.0f);
NodeItem value2 = val(0.0f); NodeItem value2 = val(0.0f);
if (STREQ(socket_out_->name, "Color")) { if (STREQ(socket_out_->name, "Color")) {
value1 = get_input_value("Color1", NodeItem::Type::Color3); value1 = get_input_value("Color1", NodeItem::Type::Color4);
value2 = get_input_value("Color2", NodeItem::Type::Color3); value2 = get_input_value("Color2", NodeItem::Type::Color4);
} }
NodeItem scale = get_input_value("Scale", NodeItem::Type::Float); NodeItem scale = get_input_value("Scale", NodeItem::Type::Float);

2
source/blender/nodes/shader/materialx/nodes/tex_environment.cc
View File

@ -50,7 +50,7 @@ NodeItem TexEnvironmentNodeParser::compute()
BLI_assert_unreachable(); BLI_assert_unreachable();
} }
res = create_node("image", NodeItem::Type::Color3); res = create_node("image", NodeItem::Type::Color4);
res.set_input("file", image_path, NodeItem::Type::Filename); res.set_input("file", image_path, NodeItem::Type::Filename);
res.set_input("texcoord", vector); res.set_input("texcoord", vector);
res.set_input("filtertype", val(filtertype)); res.set_input("filtertype", val(filtertype));