From 9ab47edd1133b4310c5e58ab4ab79715763800ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Thu, 8 Jul 2021 12:27:18 +0200 Subject: [PATCH] Fix compilation --- src/ShaderNode/DataModels/ConditionalExpression.cpp | 2 +- tests/xmake.lua | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ShaderNode/DataModels/ConditionalExpression.cpp b/src/ShaderNode/DataModels/ConditionalExpression.cpp index e73aeb79c..e10d697f3 100644 --- a/src/ShaderNode/DataModels/ConditionalExpression.cpp +++ b/src/ShaderNode/DataModels/ConditionalExpression.cpp @@ -46,7 +46,7 @@ Nz::ShaderAst::NodePtr ConditionalExpression::BuildNode(Nz::ShaderAst::Expressio const ShaderGraph& graph = GetGraph(); const auto& conditionEntry = graph.GetCondition(*m_currentConditionIndex); - return Nz::ShaderBuilder::SelectOption(conditionEntry.name, std::move(expressions[0]), std::move(expressions[1])); + return Nz::ShaderBuilder::ConditionalExpression(Nz::ShaderBuilder::Identifier(conditionEntry.name), std::move(expressions[0]), std::move(expressions[1])); } QString ConditionalExpression::caption() const diff --git a/tests/xmake.lua b/tests/xmake.lua index 7c026e527..5ee51bb78 100644 --- a/tests/xmake.lua +++ b/tests/xmake.lua @@ -26,3 +26,5 @@ target("NazaraUnitTests") add_files("main.cpp") add_files("resources.cpp") add_files("Engine/**.cpp") + + del_files("Engine/Audio/**")