From 8d839592298d927b6dd3606942b79353f73394ba Mon Sep 17 00:00:00 2001
From: ? <zeno@attnam.com>
Date: Thu, 28 Feb 2019 18:59:01 +0100
Subject: [PATCH] if triangles are drawn, outlines are disabled

---
 graph.cpp    | 3 ---
 polygons.cpp | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/graph.cpp b/graph.cpp
index 7fa9c6c4..de0b6096 100644
--- a/graph.cpp
+++ b/graph.cpp
@@ -4685,7 +4685,6 @@ void drawcell(cell *c, transmatrix V, int spinv, bool mirrored) {
             if(c->move(a) && !isWall3(c->move(a), dummy)) {
               if(a < 4 && hyperbolic) {
                 if(celldistAlt(c) >= celldistAlt(viewctr.at->c7)) continue;
-                dynamicval<color_t> p (poly_outline, 0);
                 queuepoly(V, shWall3D[a], darkena(wcol - d * get_darkval(a), 0, 0xFF));
                 }
               else {
@@ -5231,7 +5230,6 @@ void drawcell(cell *c, transmatrix V, int spinv, bool mirrored) {
           if(!c->move(t)) continue;
           if(hyperbolic && !among(t, 5, 6, 8)) continue;
           if(!hyperbolic && c->move(t) < c) continue;
-          dynamicval<color_t> p (poly_outline, gridcolor(c, c->move(t)));
           queuepoly(V, shWall3D[t], 0);
           }
         }
@@ -5418,7 +5416,6 @@ void queuecircleat(cell *c, double rad, color_t col) {
   if(DIM == 3) {
     dynamicval<color_t> p(poly_outline, col);
     for(int i=0; i<c->type; i++) {
-      if(binarytiling && i < 4) continue;
       queuepolyat(gmatrix[c], shWall3D[i], 0, PPR::SUPERLINE);
       }
     return;
diff --git a/polygons.cpp b/polygons.cpp
index 46f37e01..670a8b07 100644
--- a/polygons.cpp
+++ b/polygons.cpp
@@ -641,7 +641,7 @@ void dqi_poly::gldraw() {
         }
       }
     
-    if(outline) {
+    if(outline && !(flags & POLY_TRIANGLES)) {
       glhr::color2(outline);
       glhr::set_depthtest(model_needs_depth() && prio < PPR::SUPERLINE);
       glDrawArrays(GL_LINE_STRIP, offset, cnt);