diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-03-25 20:24:19 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-03-25 21:06:12 +0300 |
| commit | 42b5328c36de93576c8225071909db82a0c823fe (patch) | |
| tree | 3a67dde689c21c2a371698099b8a155b63e7ed2d /source/blender/draw/intern/draw_manager_exec.c | |
| parent | 94dd81941f17369a39ef8b6b74b4d8ed050153ed (diff) | |
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.
Diffstat (limited to 'source/blender/draw/intern/draw_manager_exec.c')
| -rw-r--r-- | source/blender/draw/intern/draw_manager_exec.c | 5 |
1 files changed, 1 insertions, 4 deletions
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); |