From a85ded1262a1ecf7e03fa9211a6652996bbdfab0 Mon Sep 17 00:00:00 2001 From: Lynix Date: Thu, 31 Aug 2017 19:39:45 +0200 Subject: [PATCH 1/2] Sdk/World: Fix movement --- SDK/include/NDK/World.inl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SDK/include/NDK/World.inl b/SDK/include/NDK/World.inl index d45f0ff1d..0cb0fc7c9 100644 --- a/SDK/include/NDK/World.inl +++ b/SDK/include/NDK/World.inl @@ -314,7 +314,8 @@ namespace Ndk m_systems = std::move(world.m_systems); for (const auto& systemPtr : m_systems) - systemPtr->SetWorld(this); + if (systemPtr) + systemPtr->SetWorld(this); return *this; } From a1ddce8dfb2eb9109eb527cb5e317ccab85841d4 Mon Sep 17 00:00:00 2001 From: Lynix Date: Fri, 1 Sep 2017 08:59:27 +0200 Subject: [PATCH 2/2] Utility/SimpleTextDrawer: Fix drawer regenerating glyphs everytime --- src/Nazara/Utility/SimpleTextDrawer.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Nazara/Utility/SimpleTextDrawer.cpp b/src/Nazara/Utility/SimpleTextDrawer.cpp index 739af792e..aa7afcf5c 100644 --- a/src/Nazara/Utility/SimpleTextDrawer.cpp +++ b/src/Nazara/Utility/SimpleTextDrawer.cpp @@ -396,6 +396,9 @@ namespace Nz m_lines.back().bounds.ExtendTo(m_glyphs.back().bounds); m_bounds.Set(Rectf(std::floor(m_workingBounds.x), std::floor(m_workingBounds.y), std::ceil(m_workingBounds.width), std::ceil(m_workingBounds.height))); + + m_colorUpdated = true; + m_glyphUpdated = true; } void SimpleTextDrawer::OnFontAtlasLayerChanged(const Font* font, AbstractImage* oldLayer, AbstractImage* newLayer)