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

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

Former-commit-id: 9298de8cee7d3d204c80d974dafb315e3049fd10
This commit is contained in:
Lynix 2015-05-19 01:06:56 +02:00
parent 9aacbe158c 602dd561d2
commit f82446dda3
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Nazara/Renderer/RenderTexture.cpp
View File

@ -451,6 +451,8 @@ void NzRenderTexture::Detach(nzAttachmentPoint attachmentPoint, nzUInt8 index)
attachement.texture = nullptr; attachement.texture = nullptr;
} }
m_impl->sizeUpdated = false;
if (attachement.attachmentPoint == nzAttachmentPoint_Color) if (attachement.attachmentPoint == nzAttachmentPoint_Color)
{ {
m_impl->drawBuffersUpdated = false; m_impl->drawBuffersUpdated = false;
@ -924,8 +926,11 @@ void NzRenderTexture::UpdateSize() const
m_impl->height = 0; m_impl->height = 0;
for (Attachment& attachment : m_impl->attachments) for (Attachment& attachment : m_impl->attachments)
{ {
m_impl->height = std::max(m_impl->height, attachment.height); if (attachment.isUsed)
m_impl->width = std::max(m_impl->width, attachment.width); {
m_impl->height = std::max(m_impl->height, attachment.height);
m_impl->width = std::max(m_impl->width, attachment.width);
}
} }
m_impl->sizeUpdated = true; m_impl->sizeUpdated = true;