diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2015-12-08 07:59:36 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2015-12-08 09:19:55 +0300 |
| commit | c013d64a0a2dd1455111d5080fd968561fdad8d0 (patch) | |
| tree | 2b01cb55e4027e91fb8b6c55610cdd7fadb93dfb | |
| parent | c099b862386bb771488af05bfe6444d28a1f30cb (diff) | |
disable old Mac OpenGL workaround
Comment says this is from the MacOS 10.5 era. Surely it’s been fixed by
now. If nobody complains in the next few months let’s delete this.
| -rw-r--r-- | source/blender/editors/screen/glutil.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c index 5fc849d36e1..91eea6f8248 100644 --- a/source/blender/editors/screen/glutil.c +++ b/source/blender/editors/screen/glutil.c @@ -482,9 +482,10 @@ void glaDrawPixelsTexScaled(float x, float y, int img_w, int img_h, int format, glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, zoomfilter); -#ifdef __APPLE__ +#if defined(__APPLE__) && 0 + /* [merwin] disable this workaround and see if anyone is affected. If not scrap it! Also at end of this function */ /* workaround for os x 10.5/10.6 driver bug: http://lists.apple.com/archives/Mac-opengl/2008/Jul/msg00117.html */ - glPixelZoom(1.f, 1.f); + glPixelZoom(1.0f, 1.0f); #endif /* setup seamless 2=on, 0=off */ @@ -583,7 +584,7 @@ void glaDrawPixelsTexScaled(float x, float y, int img_w, int img_h, int format, glBindTexture(GL_TEXTURE_2D, 0); glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); -#ifdef __APPLE__ +#if defined(__APPLE__) && 0 /* workaround for os x 10.5/10.6 driver bug (above) */ glPixelZoom(xzoom, yzoom); #endif |