Merge branch 'master' into NDK

Conflicts:
	src/Nazara/Physics/Geom.cpp

Former-commit-id: 8fd71e34dbe105890042acc55e30b64e7c457ed4
This commit is contained in:
Lynix
2015-05-06 23:45:41 +02:00
27 changed files with 203 additions and 143 deletions

View File

@@ -68,6 +68,7 @@ class NAZARA_API NzRenderTexture : public NzRenderTarget, NzObjectListener, NzNo
private:
bool OnObjectDestroy(const NzRefCounted* object, int index) override;
void UpdateDrawBuffers() const;
void UpdateSize() const;
void UpdateTargets() const;
NzRenderTextureImpl* m_impl = nullptr;