From e36374dfc4cb591932dc48935c8691fc21053123 Mon Sep 17 00:00:00 2001 From: Lynix Date: Mon, 19 Dec 2016 18:23:24 +0100 Subject: [PATCH 1/3] SDK/Lua: Fix EulerAngles constructor --- SDK/src/NDK/Lua/LuaBinding_Math.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SDK/src/NDK/Lua/LuaBinding_Math.cpp b/SDK/src/NDK/Lua/LuaBinding_Math.cpp index 6d30bb137..42403a443 100644 --- a/SDK/src/NDK/Lua/LuaBinding_Math.cpp +++ b/SDK/src/NDK/Lua/LuaBinding_Math.cpp @@ -20,7 +20,7 @@ namespace Ndk { eulerAngles.SetConstructor([] (Nz::LuaInstance& lua, Nz::EulerAnglesd* instance, std::size_t argumentCount) { - std::size_t argCount = std::min(argumentCount, 1U); + std::size_t argCount = std::min(argumentCount, 3U); switch (argCount) { From a00dd39c51be32bb54234ea7deb8fd8b31aa806b Mon Sep 17 00:00:00 2001 From: Lynix Date: Wed, 21 Dec 2016 18:25:22 +0100 Subject: [PATCH 2/3] Graphics/MaterialPipeline: Fix error when failing to override a shader --- src/Nazara/Graphics/MaterialPipeline.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Nazara/Graphics/MaterialPipeline.cpp b/src/Nazara/Graphics/MaterialPipeline.cpp index e9f947c90..388de632e 100644 --- a/src/Nazara/Graphics/MaterialPipeline.cpp +++ b/src/Nazara/Graphics/MaterialPipeline.cpp @@ -31,6 +31,8 @@ namespace Nz void OverrideShader(const String& path, String* source) { + ErrorFlags errFlags(ErrorFlag_Silent | ErrorFlag_ThrowExceptionDisabled); + File shaderFile(path, Nz::OpenMode_ReadOnly | Nz::OpenMode_Text); if (shaderFile.IsOpen()) { From 645e4aed17871538cf0dd3f63f0f8d05059fd480 Mon Sep 17 00:00:00 2001 From: Lynix Date: Wed, 28 Dec 2016 18:11:19 +0100 Subject: [PATCH 3/3] Examples/Particles: Disable compatibility profile by default --- examples/Particles/main.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/examples/Particles/main.cpp b/examples/Particles/main.cpp index 67bf99754..bf230bfe7 100644 --- a/examples/Particles/main.cpp +++ b/examples/Particles/main.cpp @@ -17,8 +17,6 @@ int main() { - Nz::ContextParameters::defaultCompatibilityProfile = true; - Ndk::Application app; // Mix all sounds in mono (in order to give them 3D position)