From 771f73b6bedbdd1c1e2993bd8d3680d53fa67b7c Mon Sep 17 00:00:00 2001 From: Alexander Romanov Date: Wed, 27 Jan 2016 12:06:57 +0300 Subject: World textures displaying for viewport in BI. This patch supports "Image or Movie" and "Environment map" types of world texture for the viewport. It supports: - "View", "AngMap" and "Equirectangular" types of mapping. - Different types of texture blending (according to BI world render). - Same color blending as when it lacked textures (but render via glsl). {F207734} {F207735} Example: {F275180} Original author: @valentin_b4w Regards, Alexander (Blend4Web Team). Reviewers: sergey, valentin_b4w, brecht, merwin Reviewed By: merwin Subscribers: campbellbarton, merwin, blueprintrandom, youle, a.romanov, yurikovelenov, AlexKowel, Evgeny_Rodygin Projects: #rendering, #opengl_gfx, #bf_blender:_next Differential Revision: https://developer.blender.org/D1414 --- source/gameengine/VideoTexture/Texture.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/gameengine/VideoTexture/Texture.cpp') diff --git a/source/gameengine/VideoTexture/Texture.cpp b/source/gameengine/VideoTexture/Texture.cpp index cc010f08b17..f1c7bc303ee 100644 --- a/source/gameengine/VideoTexture/Texture.cpp +++ b/source/gameengine/VideoTexture/Texture.cpp @@ -299,7 +299,7 @@ PyObject *Texture_close(Texture * self) self->m_matTexture->swapTexture(self->m_orgTex); else { - self->m_imgTexture->bindcode = self->m_orgTex; + self->m_imgTexture->bindcode[TEXTARGET_TEXTURE_2D] = self->m_orgTex; BKE_image_release_ibuf(self->m_imgTexture, self->m_imgBuf, NULL); self->m_imgBuf = NULL; } @@ -357,8 +357,8 @@ static PyObject *Texture_refresh(Texture *self, PyObject *args) // 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; + self->m_orgTex = self->m_imgTexture->bindcode[TEXTARGET_TEXTURE_2D]; + self->m_imgTexture->bindcode[TEXTARGET_TEXTURE_2D] = self->m_actTex; } } -- cgit v1.2.3