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

Merge remote-tracking branch 'refs/remotes/origin/master' into reflection-mapping

This commit is contained in:
Lynix 2017-01-06 17:29:54 +01:00
parent adf5cd32b8 645e4aed17
commit d2ee4744a9
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SDK/src/NDK/Lua/LuaBinding_Math.cpp
View File

@ -20,7 +20,7 @@ namespace Ndk
{ {
eulerAngles.SetConstructor([] (Nz::LuaInstance& lua, Nz::EulerAnglesd* instance, std::size_t argumentCount) eulerAngles.SetConstructor([] (Nz::LuaInstance& lua, Nz::EulerAnglesd* instance, std::size_t argumentCount)
{ {
std::size_t argCount = std::min<std::size_t>(argumentCount, 1U); std::size_t argCount = std::min<std::size_t>(argumentCount, 3U);
switch (argCount) switch (argCount)
{ {

2
examples/Particles/main.cpp
View File

@ -17,8 +17,6 @@
int main() int main()
{ {
Nz::ContextParameters::defaultCompatibilityProfile = true;
Ndk::Application app; Ndk::Application app;
// Mix all sounds in mono (in order to give them 3D position) // Mix all sounds in mono (in order to give them 3D position)

2
src/Nazara/Graphics/MaterialPipeline.cpp
View File

@ -31,6 +31,8 @@ namespace Nz
void OverrideShader(const String& path, String* source) void OverrideShader(const String& path, String* source)
{ {
ErrorFlags errFlags(ErrorFlag_Silent | ErrorFlag_ThrowExceptionDisabled);
File shaderFile(path, Nz::OpenMode_ReadOnly | Nz::OpenMode_Text); File shaderFile(path, Nz::OpenMode_ReadOnly | Nz::OpenMode_Text);
if (shaderFile.IsOpen()) if (shaderFile.IsOpen())
{ {