Merge branch 'master' into pr/1875

2022-05-07 13:37:15 -07:00
parent 09d30c6aee 601d08ce64
commit fdc2d76406
61 changed files with 659 additions and 116 deletions
@@ -1519,10 +1519,8 @@ QVector<Node *> Node::GetImmediateDependencies() const
  return GetDependenciesInternal(false, false);
 }

-ShaderCode Node::GetShaderCode(const QString &shader_id) const
+ShaderCode Node::GetShaderCode(const ShaderRequest &request) const
 {
-  Q_UNUSED(shader_id)
-
  return ShaderCode(QString(), QString());
 }