From 4ef139dc166241f1bde24d5c04eb0bd4f483340a Mon Sep 17 00:00:00 2001 From: shun_iwasawa Date: Nov 09 2017 08:36:56 +0000 Subject: fix plastic tool in osx --- diff --git a/toonz/sources/toonzlib/imagebuilders.cpp b/toonz/sources/toonzlib/imagebuilders.cpp index 9c24d4d..767637a 100644 --- a/toonz/sources/toonzlib/imagebuilders.cpp +++ b/toonz/sources/toonzlib/imagebuilders.cpp @@ -270,8 +270,6 @@ TImageP ImageRasterizer::build(int imFlags, void *extData) { TVectorRenderData rd(TTranslation(-off.x, -off.y), TRect(TPoint(0, 0), d), vpalette, 0, true, true); - TGlContext oldContext = tglGetCurrentContext(); - // this is too slow. { QSurfaceFormat format; @@ -279,12 +277,10 @@ TImageP ImageRasterizer::build(int imFlags, void *extData) { std::unique_ptr surface(new QOffscreenSurface()); surface->setFormat(format); + // Enabling Qt::AA_ShareOpenGLContexts attribute in main() + surface->setScreen(QOpenGLContext::globalShareContext()->screen()); surface->create(); - std::unique_ptr context(new QOpenGLContext()); - context->create(); - context->makeCurrent(surface.get()); - TRaster32P ras(d); glPushAttrib(GL_ALL_ATTRIB_BITS); @@ -336,9 +332,6 @@ TImageP ImageRasterizer::build(int imFlags, void *extData) { glPopAttrib(); - context->doneCurrent(); - tglMakeCurrent(oldContext); - TRasterImageP ri = TRasterImageP(ras); ri->setOffset(off + ras->getCenter());