From 42b5328c36de93576c8225071909db82a0c823fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Sun, 25 Mar 2018 19:24:19 +0200 Subject: DRW: Rename DRW_shgroup_uniform_buffer into DRW_shgroup_uniform_texture_ref This is in order to not mix it with the incomming buffer textures. --- source/blender/draw/intern/draw_manager_exec.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'source/blender/draw/intern/draw_manager_exec.c') diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c index dff0c175ad2..03db49bb4a7 100644 --- a/source/blender/draw/intern/draw_manager_exec.c +++ b/source/blender/draw/intern/draw_manager_exec.c @@ -844,10 +844,7 @@ static void draw_shgroup(DRWShadingGroup *shgroup, DRWState pass_state) bind_texture(tex, BIND_PERSIST); GPU_shader_uniform_texture(shgroup->shader, uni->location, tex); break; - case DRW_UNIFORM_BUFFER: - if (!DRW_state_is_fbo()) { - break; - } + case DRW_UNIFORM_TEXTURE_REF: tex = *((GPUTexture **)uni->value); BLI_assert(tex); bind_texture(tex, BIND_TEMP); -- cgit v1.2.3