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

Merge remote-tracking branch 'origin/NDK' into NDK-ShadowMapping

Browse Source 
Conflicts:
	SDK/include/NDK/Systems/RenderSystem.hpp
	SDK/src/NDK/Systems/RenderSystem.cpp

Former-commit-id: f62e9a27427d96893acd2381bb06ae928a1d3741
This commit is contained in:
Lynix
2015-06-29 21:05:09 +02:00
parent 7dd4965f9a 9c1441cc82
commit 0cb4726bf5
61 changed files with 434 additions and 2573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Nazara/Renderer/RenderWindow.cpp
View File

@@ -41,7 +41,7 @@ bool NzRenderWindow::CopyToImage(NzAbstractImage* image, const NzVector3ui& dstP
}
#endif
return CopyToImage(image, NzRectui(NzVector2ui(0U), GetSize()));
return CopyToImage(image, NzRectui(NzVector2ui(0U), GetSize()), dstPos);
}
bool NzRenderWindow::CopyToImage(NzAbstractImage* image, const NzRectui& rect, const NzVector3ui& dstPos) const