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

Minor fixes

This commit is contained in:
Jérôme Leclercq 2021-10-21 13:05:49 +02:00
parent 6bab824e4f
commit 73838f5f08
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/Nazara/Widgets/BaseWidget.inl
View File

@ -258,6 +258,18 @@ namespace Nz
//Resize(m_preferredSize); //Resize(m_preferredSize);
} }
inline entt::registry& BaseWidget::GetRegistry()
{
assert(m_registry);
return *m_registry;
}
inline const entt::registry& BaseWidget::GetRegistry() const
{
assert(m_registry);
return *m_registry;
}
inline bool BaseWidget::IsRegisteredToCanvas() const inline bool BaseWidget::IsRegisteredToCanvas() const
{ {
return m_canvas && m_canvasIndex != InvalidCanvasIndex; return m_canvas && m_canvasIndex != InvalidCanvasIndex;

12
src/Nazara/Widgets/BaseWidget.cpp
View File

@ -324,18 +324,6 @@ namespace Nz
{ {
} }
inline entt::registry& BaseWidget::GetRegistry()
{
assert(m_registry);
return *m_registry;
}
inline const entt::registry& BaseWidget::GetRegistry() const
{
assert(m_registry);
return *m_registry;
}
void BaseWidget::ShowChildren(bool show) void BaseWidget::ShowChildren(bool show)
{ {
for (const auto& widgetPtr : m_children) for (const auto& widgetPtr : m_children)

1
src/ShaderNode/ShaderGraph.cpp
View File

@ -528,7 +528,6 @@ Nz::ShaderAst::StatementPtr ShaderGraph::ToAst() const
statements.push_back(Nz::ShaderBuilder::DeclareStruct(std::move(structDesc))); statements.push_back(Nz::ShaderBuilder::DeclareStruct(std::move(structDesc)));
} }
Nz::ShaderAst::ExpressionType returnType;
if (!m_outputs.empty()) if (!m_outputs.empty())
{ {
Nz::ShaderAst::StructDescription structDesc; Nz::ShaderAst::StructDescription structDesc;