[Bf-blender-cvs] [709315a0d7c] blender2.8: GPUTexture : Fix Bind/Unbind function so it works with multisample textures.
Clément Foucault
noreply at git.blender.org
Mon Sep 25 20:46:45 CEST 2017
Commit: 709315a0d7cd382320c060f369717f8af4ea364e
Author: Clément Foucault
Date: Sat Sep 23 20:34:53 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB709315a0d7cd382320c060f369717f8af4ea364e
GPUTexture : Fix Bind/Unbind function so it works with multisample textures.
===================================================================
M source/blender/gpu/intern/gpu_texture.c
===================================================================
diff --git a/source/blender/gpu/intern/gpu_texture.c b/source/blender/gpu/intern/gpu_texture.c
index d7f28ad1856..ac8c8bacac1 100644
--- a/source/blender/gpu/intern/gpu_texture.c
+++ b/source/blender/gpu/intern/gpu_texture.c
@@ -796,7 +796,7 @@ void GPU_texture_bind(GPUTexture *tex, int number)
glActiveTexture(GL_TEXTURE0 + number);
if (tex->bindcode != 0)
- glBindTexture(tex->target_base, tex->bindcode);
+ glBindTexture(tex->target, tex->bindcode);
else
GPU_invalid_tex_bind(tex->target_base);
@@ -819,7 +819,7 @@ void GPU_texture_unbind(GPUTexture *tex)
if (tex->number != 0)
glActiveTexture(GL_TEXTURE0 + tex->number);
- glBindTexture(tex->target_base, 0);
+ glBindTexture(tex->target, 0);
if (tex->number != 0)
glActiveTexture(GL_TEXTURE0);
More information about the Bf-blender-cvs
mailing list