ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-29 04:37:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

commiting patch to fix T30173

Browse source
This commit is contained in:
Benoit Bolsee 2014-05-26 10:38:12 +01:00 • committed by Ines Almeida
parent c391a67830
commit cf4646b95f
2 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,6 +41,7 @@
#include "DNA_meshdata_types.h"
#include "DNA_image_types.h"
#include "IMB_imbuf_types.h"
#include "BKE_image.h"
#include "MEM_guardedalloc.h"
@ -158,6 +159,7 @@ static PyObject *Texture_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
// initialize object structure
self->m_actTex = 0;
self->m_orgSaved = false;
self->m_imgBuf = NULL;
self->m_imgTexture = NULL;
self->m_matTexture = NULL;
self->m_mipmap = false;
@ -282,7 +284,11 @@ PyObject *Texture_close(Texture * self)
if (self->m_useMatTexture)
self->m_matTexture->swapTexture(self->m_orgTex);
else
{
self->m_imgTexture->bindcode = self->m_orgTex;
BKE_image_release_ibuf(self->m_imgTexture, self->m_imgBuf, NULL);
self->m_imgBuf = NULL;
}
// drop actual texture
if (self->m_actTex != 0)
{
@ -331,6 +337,12 @@ static PyObject *Texture_refresh(Texture *self, PyObject *args)
self->m_orgTex = self->m_matTexture->swapTexture(self->m_actTex);
else
{
// Swapping will work only if the GPU has already loaded the image.
// If not, it will delete and overwrite our texture on next render.
// To avoid that, we acquire the image buffer now.
// WARNING: GPU has a ImageUser to pass, we don't. Using NULL
// works on image file, not necessarily on other type of image.
self->m_imgBuf = BKE_image_acquire_ibuf(self->m_imgTexture, NULL, NULL);
self->m_orgTex = self->m_imgTexture->bindcode;
self->m_imgTexture->bindcode = self->m_actTex;
}

4
source/gameengine/VideoTexture/Texture.h
View file

@ -43,6 +43,8 @@
#include "Exception.h"
struct ImBuf;
// type Texture declaration
struct Texture
{
@ -58,6 +60,8 @@ struct Texture
// original texture saved
bool m_orgSaved;
// kernel image buffer, to make sure the image is loaded before we swap the bindcode
struct ImBuf *m_imgBuf;
// texture image for game materials
Image * m_imgTexture;
// texture for blender materials