diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-25 16:02:56 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-25 16:02:56 +0400 |
| commit | d0b74452ad296d9dfe0ca131c092a39528901b4b (patch) | |
| tree | 9801b6f9cd94aebf3df6fb547b28ed4c6cd0c017 /source/blender/editors/screen/glutil.c | |
| parent | f4d37847afc296d23deab7975aa1a63a032344f2 (diff) | |
Fix #35074: Image editor shows color banding on rendered images (even with dither set to 2.0)
Mistake in one of changes to GLSL display function,
missed fallback mode in case dither is non-zero,
Diffstat (limited to 'source/blender/editors/screen/glutil.c')
| -rw-r--r-- | source/blender/editors/screen/glutil.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c index 932ff9b4887..44d7c8d0114 100644 --- a/source/blender/editors/screen/glutil.c +++ b/source/blender/editors/screen/glutil.c @@ -1043,15 +1043,15 @@ void glaDrawImBuf_glsl(ImBuf *ibuf, float x, float y, int zoomfilter, return; /* Dithering is not supported on GLSL yet */ - // force_fallback = ibuf->dither != 0.0f; + force_fallback |= ibuf->dither != 0.0f; /* Single channel images could not be transformed using GLSL yet */ - // force_fallback = ibuf->channels == 1; + force_fallback |= ibuf->channels == 1; /* If user decided not to use GLSL, fallback to glaDrawPixelsAuto */ - force_fallback = !ELEM(U.image_draw_method, - IMAGE_DRAW_METHOD_AUTO, - IMAGE_DRAW_METHOD_GLSL); + force_fallback |= !ELEM(U.image_draw_method, + IMAGE_DRAW_METHOD_AUTO, + IMAGE_DRAW_METHOD_GLSL); /* This is actually lots of crap, but currently not sure about * more clear way to bypass partial buffer update crappyness |