Merge branch 'master' into automatic-file-fix

2021-10-28 09:57:59 +02:00
parent a02b1952c0 7d279dce4b
commit a3d9aaf1fb
55 changed files with 780 additions and 517 deletions
--- a/src/Nazara/Widgets/BaseWidget.cpp
+++ b/src/Nazara/Widgets/BaseWidget.cpp
@@ -325,18 +325,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)