diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-29 19:50:12 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-29 19:50:12 +0400 |
| commit | cabe929b2a3d6ec34abff49e07961cc1ceb39a15 (patch) | |
| tree | 698058c4ce93fd02af051da87c2c2d408e569ac8 /source/blender/editors | |
| parent | 511e3466da62389ac318d631ddce45a87e5f2408 (diff) | |
Changes to image draw method options
It's now default to 2D textures, and no AUTO mode at this
moment, since detecting which method is the best not so
simple.
Image drawing could manually be switched to GLSL for tests
and feedback, but for default GLSL is not so much great.
Reason of this is huge images, where operations like panning
becomes dead slow comparing GLSL vs. 2D texture.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/resources.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/screen/glutil.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_draw.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index b4246fe5b9c..89469d47fba 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -2187,6 +2187,9 @@ void init_userdef_do_versions(void) if (U.pixelsize == 0.0f) U.pixelsize = 1.0f; + if (U.image_draw_method == 0) + U.image_draw_method = IMAGE_DRAW_METHOD_2DTEXTURE; + /* funny name, but it is GE stuff, moves userdef stuff to engine */ // XXX space_set_commmandline_options(); /* this timer uses U */ diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c index 44d7c8d0114..723dce5e226 100644 --- a/source/blender/editors/screen/glutil.c +++ b/source/blender/editors/screen/glutil.c @@ -1049,9 +1049,7 @@ void glaDrawImBuf_glsl(ImBuf *ibuf, float x, float y, int zoomfilter, 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 |= (U.image_draw_method != IMAGE_DRAW_METHOD_GLSL); /* This is actually lots of crap, but currently not sure about * more clear way to bypass partial buffer update crappyness diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index efda7554b33..d1684e91bea 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -1062,7 +1062,7 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq else { bool force_fallback = false; - force_fallback |= !ELEM(U.image_draw_method, IMAGE_DRAW_METHOD_AUTO, IMAGE_DRAW_METHOD_GLSL); + force_fallback |= (U.image_draw_method != IMAGE_DRAW_METHOD_GLSL); force_fallback |= (ibuf->dither != 0.0f); if (force_fallback) { |