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

Merge branch 'master' into multicam

Browse Source
This commit is contained in:
itsmattkc
2022-09-29 21:18:30 -07:00
parent 2d0af6f335 b28495c7a6
commit 76e0e2bd13
17 changed files with 191 additions and 171 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.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);
} else {