diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-11-23 03:45:54 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-11-23 09:40:10 +0300 |
| commit | bc8504cb4c93eb3aac22222f62966c13560a2bf6 (patch) | |
| tree | 1e3bcf5bf5a02a9722ef049dfc506f5b4c06d72e /source/blender/gpu/intern | |
| parent | 676d790d29ead413a9619aa94005c5248d274cb2 (diff) | |
Cleanup: shadowing (blenlib, gpu, imbuf)
Diffstat (limited to 'source/blender/gpu/intern')
| -rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index bf7b8fbc386..3ad396a532c 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -1029,14 +1029,14 @@ static bool GPU_check_scaled_image(ImBuf *ibuf, Image *ima, float *frect, int x, /* float rectangles are already continuous in memory so we can use IMB_scaleImBuf */ if (frect) { - ImBuf *ibuf = IMB_allocFromBuffer(NULL, frect, w, h); - IMB_scaleImBuf(ibuf, rectw, recth); + ImBuf *ibuf_scale = IMB_allocFromBuffer(NULL, frect, w, h); + IMB_scaleImBuf(ibuf_scale, rectw, recth); glBindTexture(GL_TEXTURE_2D, ima->bindcode); glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, rectw, recth, GL_RGBA, - GL_FLOAT, ibuf->rect_float); + GL_FLOAT, ibuf_scale->rect_float); - IMB_freeImBuf(ibuf); + IMB_freeImBuf(ibuf_scale); } /* byte images are not continuous in memory so do manual interpolation */ else { |