diff --git a/include/Nazara/Widgets/BaseWidget.inl b/include/Nazara/Widgets/BaseWidget.inl index 37f1eaeff..4999a5a70 100644 --- a/include/Nazara/Widgets/BaseWidget.inl +++ b/include/Nazara/Widgets/BaseWidget.inl @@ -258,6 +258,18 @@ namespace Nz //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 { return m_canvas && m_canvasIndex != InvalidCanvasIndex; diff --git a/src/Nazara/Widgets/BaseWidget.cpp b/src/Nazara/Widgets/BaseWidget.cpp index a79618625..59dbee8a9 100644 --- a/src/Nazara/Widgets/BaseWidget.cpp +++ b/src/Nazara/Widgets/BaseWidget.cpp @@ -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) { for (const auto& widgetPtr : m_children) diff --git a/src/ShaderNode/ShaderGraph.cpp b/src/ShaderNode/ShaderGraph.cpp index 369168e5a..83be7a3fc 100644 --- a/src/ShaderNode/ShaderGraph.cpp +++ b/src/ShaderNode/ShaderGraph.cpp @@ -528,7 +528,6 @@ Nz::ShaderAst::StatementPtr ShaderGraph::ToAst() const statements.push_back(Nz::ShaderBuilder::DeclareStruct(std::move(structDesc))); } - Nz::ShaderAst::ExpressionType returnType; if (!m_outputs.empty()) { Nz::ShaderAst::StructDescription structDesc;