oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed generator with merge issue

Browse Source
This commit is contained in:
itsmattkc
2022-09-27 18:44:00 -07:00
parent 9d54e24d9d
commit a29fa4bc4d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/generator/shape/generatorwithmerge.cpp
+1 -1
View File
@@ -59,7 +59,7 @@ void GeneratorWithMerge::PushMergableJob(const NodeValueRow &value, TexturePtr j
merge.SetShaderID(QStringLiteral("mrg")); merge.SetShaderID(QStringLiteral("mrg"));
merge.Insert(MergeNode::kBaseIn, value[kBaseInput]); merge.Insert(MergeNode::kBaseIn, value[kBaseInput]);
merge.Insert(MergeNode::kBlendIn, NodeValue(NodeValue::kTexture, base->toJob(*job->job()), this)); merge.Insert(MergeNode::kBlendIn, NodeValue(NodeValue::kTexture, job, this));
table->Push(NodeValue::kTexture, base->toJob(merge), this); table->Push(NodeValue::kTexture, base->toJob(merge), this);
} else { } else {