sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation

This commit is contained in:
Jérôme Leclercq 2021-07-08 12:27:18 +02:00
parent 1b4ab7e625
commit 9ab47edd11
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ShaderNode/DataModels/ConditionalExpression.cpp
View File

@ -46,7 +46,7 @@ Nz::ShaderAst::NodePtr ConditionalExpression::BuildNode(Nz::ShaderAst::Expressio
const ShaderGraph& graph = GetGraph(); const ShaderGraph& graph = GetGraph();
const auto& conditionEntry = graph.GetCondition(*m_currentConditionIndex); 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 QString ConditionalExpression::caption() const

2
tests/xmake.lua
View File

@ -26,3 +26,5 @@ target("NazaraUnitTests")
add_files("main.cpp") add_files("main.cpp")
add_files("resources.cpp") add_files("resources.cpp")
add_files("Engine/**.cpp") add_files("Engine/**.cpp")
del_files("Engine/Audio/**")