From ecfcc09106ae0e9d47580d2b2d9dec8d8e6897eb Mon Sep 17 00:00:00 2001
From: shun-iwasawa <shun.iwasawa@ghibli.jp>
Date: Mar 19 2021 04:38:15 +0000
Subject: fix opengl line smoothing


---

diff --git a/toonz/sources/common/tgl/tgl.cpp b/toonz/sources/common/tgl/tgl.cpp
index 3208b1e..6f5a239 100644
--- a/toonz/sources/common/tgl/tgl.cpp
+++ b/toonz/sources/common/tgl/tgl.cpp
@@ -66,7 +66,7 @@ double tglGetPixelSize2() {
   glMatrixMode(GL_MODELVIEW);
   glGetDoublev(GL_MODELVIEW_MATRIX, mat);
 
-  double det                      = fabs(mat[0] * mat[5] - mat[1] * mat[4]);
+  double det = fabs(mat[0] * mat[5] - mat[1] * mat[4]);
   if (det < TConsts::epsilon) det = TConsts::epsilon;
   return 1.0 / det;
 }
@@ -245,6 +245,7 @@ void tglEnableBlending(GLenum src, GLenum dst) {
 
 void tglEnableLineSmooth(bool enable, double lineSize) {
   if (enable) {
+    tglEnableBlending();
     glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
     glEnable(GL_LINE_SMOOTH);
     glLineWidth(lineSize);
@@ -431,7 +432,7 @@ void tglDraw(const TRectD &rect, const std::vector<TRaster32P> &textures,
   unsigned int level = 1;
   while (pixelSize2 * level * level <= 1.0) level <<= 1;
 
-  unsigned int texturesCount       = (int)textures.size();
+  unsigned int texturesCount = (int)textures.size();
   if (level > texturesCount) level = texturesCount;
 
   level = texturesCount - level;
@@ -467,8 +468,8 @@ void tglDraw(const TRectD &rect, const TRaster32P &tex, bool blending) {
     texture = TRaster32P(texWidth, texHeight);
     texture->fill(TPixel32(0, 0, 0, 0));
     texture->copy(tex);
-    lwTex                  = (texLx) / (double)(texWidth);
-    lhTex                  = (texLy) / (double)(texHeight);
+    lwTex = (texLx) / (double)(texWidth);
+    lhTex = (texLy) / (double)(texHeight);
     if (lwTex > 1.0) lwTex = 1.0;
     if (lhTex > 1.0) lhTex = 1.0;
   } else
@@ -587,10 +588,10 @@ void tglBuildMipmaps(std::vector<TRaster32P> &rasters,
     ly >>= 1;
     if (lx < 1) lx = 1;
     if (ly < 1) ly = 1;
-    rasters[i]     = TRaster32P(lx, ly);
-    sx             = (double)lx / (double)ras2Lx;
-    sy             = (double)ly / (double)ras2Ly;
-    rasters[i]     = TRaster32P(lx, ly);
+    rasters[i] = TRaster32P(lx, ly);
+    sx         = (double)lx / (double)ras2Lx;
+    sy         = (double)ly / (double)ras2Ly;
+    rasters[i] = TRaster32P(lx, ly);
 #ifndef SCALE_BY_GLU
     TRop::resample(rasters[i], ras2, TScale(sx, sy), resampleFilter);
 #else
diff --git a/toonz/sources/tnzext/meshutils.cpp b/toonz/sources/tnzext/meshutils.cpp
index c21f09c..7d3b0e9 100644
--- a/toonz/sources/tnzext/meshutils.cpp
+++ b/toonz/sources/tnzext/meshutils.cpp
@@ -326,7 +326,7 @@ void tglDraw(const TMeshImage &meshImage, const DrawableTextureData &texData,
                GL_HINT_BIT);  // Preserve original status bits
 
   glEnable(GL_BLEND);
-
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
   glEnable(GL_LINE_SMOOTH);
   glLineWidth(1.0f);
 
diff --git a/toonz/sources/tnztools/plastictool.cpp b/toonz/sources/tnztools/plastictool.cpp
index 2c2985e..9787069 100644
--- a/toonz/sources/tnztools/plastictool.cpp
+++ b/toonz/sources/tnztools/plastictool.cpp
@@ -1973,9 +1973,8 @@ void PlasticTool::drawOnionSkinSkeletons_animate(double pixelSize) {
     PlasticSkeleton skel;
     m_sd->storeDeformedSkeleton(m_sd->skeletonId(sdFrame), sdFrame, skel);
 
-    UCHAR alpha =
-        255 -
-        255.0 * OnionSkinMask::getOnionSkinFade(abs(osRows[r] - currentRow));
+    UCHAR alpha = 255 - 255.0 * OnionSkinMask::getOnionSkinFade(
+                                    abs(osRows[r] - currentRow));
     drawSkeleton(skel, pixelSize, alpha);
   }
 }
@@ -2114,6 +2113,7 @@ void PlasticTool::draw() {
   glPushAttrib(GL_LINE_BIT | GL_COLOR_BUFFER_BIT | GL_ENABLE_BIT);
 
   glEnable(GL_BLEND);
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
   glEnable(GL_LINE_SMOOTH);
 
   switch (m_mode.getIndex()) {
diff --git a/toonz/sources/toonzlib/stagevisitor.cpp b/toonz/sources/toonzlib/stagevisitor.cpp
index ad6c72d..304ba53 100644
--- a/toonz/sources/toonzlib/stagevisitor.cpp
+++ b/toonz/sources/toonzlib/stagevisitor.cpp
@@ -1403,6 +1403,7 @@ void onMeshImage(TMeshImage *mi, const Stage::Player &player,
 
   // Prepare OpenGL
   glEnable(GL_BLEND);
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
   glEnable(GL_LINE_SMOOTH);
 
   // Push mesh coordinates
@@ -1579,6 +1580,7 @@ void onPlasticDeformedImage(TStageObject *playerObj,
 
   // Set up OpenGL stuff
   glEnable(GL_BLEND);
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
   glEnable(GL_LINE_SMOOTH);
 
   // Push mesh coordinates