diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-13 08:14:35 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-13 08:14:35 +0400 |
| commit | 2d1a05874b46d31ee3598ec786a77b45512d99e1 (patch) | |
| tree | f0c453f231b52b5898911f77365d908145da8460 /source/blender/gpu | |
| parent | 7be1cd733dfe064d1976b706610c39f97e536b90 (diff) | |
| parent | 399ad54204ad9c3bc9dbd15ec4840824d224dc0c (diff) | |
svn merge ^/trunk/blender -r44024:44076
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 59802f2cf58..926faeb417e 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -598,9 +598,6 @@ int GPU_verify_image(Image *ima, ImageUser *iuser, int tftile, int compare, int if(use_high_bit_depth) { fscalerect= MEM_mallocN(rectw*recth*sizeof(*fscalerect)*4, "fscalerect"); gluScaleImage(GL_RGBA, tpx, tpy, GL_FLOAT, frect, rectw, recth, GL_FLOAT, fscalerect); - /* frect will refer to ibuf->rect_float when not color converting. We don't want to free that */ - if(do_color_management) - MEM_freeN(frect); frect = fscalerect; } |