archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merged changes in the trunk up to revision 42116.

Browse Source
This commit is contained in:
Tamito Kajiyama
2011-11-26 13:11:55 +00:00
parent 9bd9b7e958 df22957bfc
commit b6569ee4e7
267 changed files with 3952 additions and 2521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/gameengine/VideoTexture/Texture.cpp
View File

@@ -329,7 +329,17 @@ PyObject * Texture_refresh (Texture * self, PyObject * args)
// get texture size
short * orgSize = self->m_source->m_image->getSize();
// calc scaled sizes
short size[] = {ImageBase::calcSize(orgSize[0]), ImageBase::calcSize(orgSize[1])};
short size[2];
if (GLEW_ARB_texture_non_power_of_two)
{
size[0] = orgSize[0];
size[1] = orgSize[1];
}
else
{
size[0] = ImageBase::calcSize(orgSize[0]);
size[1] = ImageBase::calcSize(orgSize[1]);
}
// scale texture if needed
if (size[0] != orgSize[0] || size[1] != orgSize[1])
{