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 +2 -6
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0ab36da693 - Show all commits

2
source/blender/nodes/shader/materialx/nodes/node_parser.h
View File

@ -121,6 +121,4 @@ DECLARE_SHADER_NODE_PARSER(EmissionNodeParser)
DECLARE_SHADER_NODE_PARSER(MixShaderNodeParser) DECLARE_SHADER_NODE_PARSER(MixShaderNodeParser)
DECLARE_SHADER_NODE_PARSER(SubsurfaceScatteringNodeParser) DECLARE_SHADER_NODE_PARSER(SubsurfaceScatteringNodeParser)
extern const MaterialX::Color4 TEX_ERROR_COLOR;
} // namespace blender::nodes::materialx } // namespace blender::nodes::materialx

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

@ -12,7 +12,7 @@ namespace blender::nodes::materialx {
NodeItem TexEnvironmentNodeParser::compute() NodeItem TexEnvironmentNodeParser::compute()
{ {
NodeItem res = val(TEX_ERROR_COLOR); NodeItem res = val(MaterialX::Color4(1.0f, 0.0f, 1.0f, 1.0f));
Image *image = (Image *)node_->id; Image *image = (Image *)node_->id;
if (!image) { if (!image) {

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

@ -10,11 +10,9 @@
namespace blender::nodes::materialx { namespace blender::nodes::materialx {
const MaterialX::Color4 TEX_ERROR_COLOR(1.0f, 0.0f, 1.0f, 1.0f);
NodeItem TexImageNodeParser::compute() NodeItem TexImageNodeParser::compute()
{ {
NodeItem res = val(TEX_ERROR_COLOR); NodeItem res = val(MaterialX::Color4(1.0f, 0.0f, 1.0f, 1.0f));
Image *image = (Image *)node_->id; Image *image = (Image *)node_->id;
if (image) { if (image) {