diff --git a/plugins/assistants/Assistants/VanishingPointAssistant.cc b/plugins/assistants/Assistants/VanishingPointAssistant.cc
index 3d11d2539d..3cae70dd14 100644
--- a/plugins/assistants/Assistants/VanishingPointAssistant.cc
+++ b/plugins/assistants/Assistants/VanishingPointAssistant.cc
@@ -1,318 +1,318 @@
 /*
  * Copyright (c) 2008 Cyrille Berger <cberger@cberger.net>
  * Copyright (c) 2010 Geoffry Song <goffrie@gmail.com>
  * Copyright (c) 2014 Wolthera van Hövell tot Westerflier <griffinvalley@gmail.com>
  * Copyright (c) 2017 Scott Petrovic <scottpetrovic@gmail.com>
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "VanishingPointAssistant.h"
 
 #include "kis_debug.h"
 #include <klocalizedstring.h>
 
 #include <QPainter>
 #include <QLinearGradient>
 #include <QTransform>
 
 #include <kis_canvas2.h>
 #include <kis_coordinates_converter.h>
 #include <kis_algebra_2d.h>
 #include <kis_dom_utils.h>
 #include <math.h>
 
 VanishingPointAssistant::VanishingPointAssistant()
     : KisPaintingAssistant("vanishing point", i18n("Vanishing Point assistant"))
 {
 }
 
 VanishingPointAssistant::VanishingPointAssistant(const VanishingPointAssistant &rhs, QMap<KisPaintingAssistantHandleSP, KisPaintingAssistantHandleSP> &handleMap)
     : KisPaintingAssistant(rhs, handleMap)
     , m_canvas(rhs.m_canvas)
     , m_referenceLineDensity(rhs.m_referenceLineDensity)
 {
 }
 
 KisPaintingAssistantSP VanishingPointAssistant::clone(QMap<KisPaintingAssistantHandleSP, KisPaintingAssistantHandleSP> &handleMap) const
 {
     return KisPaintingAssistantSP(new VanishingPointAssistant(*this, handleMap));
 }
 
 QPointF VanishingPointAssistant::project(const QPointF& pt, const QPointF& strokeBegin)
 {
     //Q_ASSERT(handles().size() == 1 || handles().size() == 5);
     //code nicked from the perspective ruler.
     qreal dx = pt.x() - strokeBegin.x();
     qreal dy = pt.y() - strokeBegin.y();
 
     if (dx * dx + dy * dy < 4.0) {
         // allow some movement before snapping
         return strokeBegin;
     }
 
     //dbgKrita<<strokeBegin<< ", " <<*handles()[0];
     QLineF snapLine = QLineF(*handles()[0], strokeBegin);
     
     
     dx = snapLine.dx();
     dy = snapLine.dy();
 
     const qreal dx2 = dx * dx;
     const qreal dy2 = dy * dy;
     const qreal invsqrlen = 1.0 / (dx2 + dy2);
 
     QPointF r(dx2 * pt.x() + dy2 * snapLine.x1() + dx * dy * (pt.y() - snapLine.y1()),
               dx2 * snapLine.y1() + dy2 * pt.y() + dx * dy * (pt.x() - snapLine.x1()));
 
     r *= invsqrlen;
     return r;
 }
 
 QPointF VanishingPointAssistant::adjustPosition(const QPointF& pt, const QPointF& strokeBegin)
 {
     return project(pt, strokeBegin);
 }
 
 void VanishingPointAssistant::drawAssistant(QPainter& gc, const QRectF& updateRect, const KisCoordinatesConverter* converter, bool cached, KisCanvas2* canvas, bool assistantVisible, bool previewVisible)
 {
     // HACK ALERT: side handles aren't saved
     // we need to just add a default position for now if we are loading a vanishing point
     // we will need to look at how we load/save assistants in general to remedy this
     if (sideHandles().isEmpty()) {
         QPointF vpPoint = *handles()[0]; // main vanishing point
         addHandle(new KisPaintingAssistantHandle(vpPoint + QPointF(-70,0)), HandleType::SIDE);
         addHandle(new KisPaintingAssistantHandle(vpPoint + QPointF(-140,0)), HandleType::SIDE);
         addHandle(new KisPaintingAssistantHandle(vpPoint + QPointF(70,0)), HandleType::SIDE);
         addHandle(new KisPaintingAssistantHandle(vpPoint + QPointF(140,0)), HandleType::SIDE);
     }
 
     gc.save();
     gc.resetTransform();
     QPointF mousePos(0,0);
     
-    if (canvas){
+    if (canvas) {
         //simplest, cheapest way to get the mouse-position//
         mousePos= canvas->canvasWidget()->mapFromGlobal(QCursor::pos());
         m_canvas = canvas;
     }
     else {
         //...of course, you need to have access to a canvas-widget for that.//
         mousePos = QCursor::pos();//this'll give an offset//
         dbgFile<<"canvas does not exist in ruler, you may have passed arguments incorrectly:"<<canvas;
     }
     
 
 
-     // draw controls when we are not editing
-     if (canvas->paintingAssistantsDecoration()->isEditingAssistants() == false && isAssistantComplete()) {
+    // draw controls when we are not editing
+    if (canvas && canvas->paintingAssistantsDecoration()->isEditingAssistants() == false && isAssistantComplete()) {
 
-         if (isSnappingActive() && previewVisible == true) {
-             //don't draw if invalid.
-             QTransform initialTransform = converter->documentToWidgetTransform();
-             QPointF startPoint = initialTransform.map(*handles()[0]);
+        if (isSnappingActive() && previewVisible == true) {
+            //don't draw if invalid.
+            QTransform initialTransform = converter->documentToWidgetTransform();
+            QPointF startPoint = initialTransform.map(*handles()[0]);
 
-             QLineF snapLine= QLineF(startPoint, mousePos);
-             QRect viewport= gc.viewport();
+            QLineF snapLine= QLineF(startPoint, mousePos);
+            QRect viewport= gc.viewport();
 
-             KisAlgebra2D::intersectLineRect(snapLine, viewport);
+            KisAlgebra2D::intersectLineRect(snapLine, viewport);
 
-             QRect bounds= QRect(snapLine.p1().toPoint(), snapLine.p2().toPoint());
+            QRect bounds= QRect(snapLine.p1().toPoint(), snapLine.p2().toPoint());
 
-             QPainterPath path;
+            QPainterPath path;
 
-             if (bounds.contains(startPoint.toPoint())){
-                 path.moveTo(startPoint);
-                 path.lineTo(snapLine.p1());
-             }
-             else
-             {
-                 path.moveTo(snapLine.p1());
-                 path.lineTo(snapLine.p2());
-             }
+            if (bounds.contains(startPoint.toPoint())){
+                path.moveTo(startPoint);
+                path.lineTo(snapLine.p1());
+            }
+            else
+            {
+                path.moveTo(snapLine.p1());
+                path.lineTo(snapLine.p2());
+            }
 
-             drawPreview(gc, path);//and we draw the preview.
-         }
-     }
+            drawPreview(gc, path);//and we draw the preview.
+        }
+    }
 
 
 
 
     // editor specific controls display
     if (canvas->paintingAssistantsDecoration()->isEditingAssistants()) {
 
         // draws a circle around the vanishing point node while editing
         QTransform initialTransform = converter->documentToWidgetTransform();
         QPointF p0 = initialTransform.map(*handles()[0]); // main vanishing point
         QPointF p1 = initialTransform.map(*sideHandles()[0]);
         QPointF p2 = initialTransform.map(*sideHandles()[1]);
         QPointF p3 = initialTransform.map(*sideHandles()[2]);
         QPointF p4 = initialTransform.map(*sideHandles()[3]);
 
 
         QRectF ellipse = QRectF(QPointF(p0.x() -15, p0.y() -15), QSizeF(30, 30));
 
         QPainterPath pathCenter;
         pathCenter.addEllipse(ellipse);
         drawPath(gc, pathCenter, isSnappingActive());
 
         QColor paintingColor = effectiveAssistantColor();
 
 
         // draw the lines connecting the different nodes
         QPen penStyle(paintingColor, 2.0, Qt::SolidLine);
 
         if (!isSnappingActive()) {
             QColor snappingColor = paintingColor;
             snappingColor.setAlpha(snappingColor.alpha() * 0.2);
 
             penStyle.setColor(snappingColor);
         }
 
         gc.save();
         gc.setPen(penStyle);
         gc.drawLine(p0, p1);
         gc.drawLine(p0, p3);
         gc.drawLine(p1, p2);
         gc.drawLine(p3, p4);
         gc.restore();
     }
 
 
     // draw references guide for vanishing points at specified density
     // this is shown as part of the preview, so don't show if preview is off
     if ( (assistantVisible && canvas->paintingAssistantsDecoration()->outlineVisibility()) && this->isSnappingActive() ) {
 
         // cycle through degrees from 0 to 180. We are doing an infinite line, so we don't need to go 360
         QTransform initialTransform = converter->documentToWidgetTransform();
         QPointF p0 = initialTransform.map(*handles()[0]); // main vanishing point
 
         for (int currentAngle=0; currentAngle <= 180; currentAngle = currentAngle + m_referenceLineDensity ) {
 
-           // determine the correct angle based on the iteration
-           float xPos = cos(currentAngle * M_PI / 180);
-           float yPos = sin(currentAngle * M_PI / 180);
-           QPointF unitAngle;
-           unitAngle.setX(p0.x() + xPos);
-           unitAngle.setY(p0.y() + yPos);
-
-           // find point
-           QLineF snapLine= QLineF(p0, unitAngle);
-           QRect viewport= gc.viewport();
-           KisAlgebra2D::intersectLineRect(snapLine, viewport);
-
-           // make a line from VP center to edge of canvas with that angle
-           QPainterPath path;
-           path.moveTo(snapLine.p1());
-           path.lineTo(snapLine.p2());
-           drawPreview(gc, path);//and we draw the preview.
+            // determine the correct angle based on the iteration
+            float xPos = cos(currentAngle * M_PI / 180);
+            float yPos = sin(currentAngle * M_PI / 180);
+            QPointF unitAngle;
+            unitAngle.setX(p0.x() + xPos);
+            unitAngle.setY(p0.y() + yPos);
+
+            // find point
+            QLineF snapLine= QLineF(p0, unitAngle);
+            QRect viewport= gc.viewport();
+            KisAlgebra2D::intersectLineRect(snapLine, viewport);
+
+            // make a line from VP center to edge of canvas with that angle
+            QPainterPath path;
+            path.moveTo(snapLine.p1());
+            path.lineTo(snapLine.p2());
+            drawPreview(gc, path);//and we draw the preview.
         }
     }
 
 
     gc.restore();
 
     KisPaintingAssistant::drawAssistant(gc, updateRect, converter, cached, canvas, assistantVisible, previewVisible);
 }
 
 void VanishingPointAssistant::drawCache(QPainter& gc, const KisCoordinatesConverter *converter, bool assistantVisible)
 {
     if (!m_canvas || !isAssistantComplete()) {
         return;
     }
 
     if (assistantVisible == false ||   m_canvas->paintingAssistantsDecoration()->isEditingAssistants()) {
         return;
     }
 
     QTransform initialTransform = converter->documentToWidgetTransform();
     QPointF p0 = initialTransform.map(*handles()[0]);
 
     // draws an "X"
     QPainterPath path;
     path.moveTo(QPointF(p0.x() - 10.0, p0.y() - 10.0));
     path.lineTo(QPointF(p0.x() + 10.0, p0.y() + 10.0));
 
     path.moveTo(QPointF(p0.x() - 10.0, p0.y() + 10.0));
     path.lineTo(QPointF(p0.x() + 10.0, p0.y() - 10.0));
 
 
     drawPath(gc, path, isSnappingActive());
 }
 
 QPointF VanishingPointAssistant::getEditorPosition() const
 {
     return (*handles()[0]);
 }
 
 void VanishingPointAssistant::setReferenceLineDensity(float value)
 {
     // cannot have less than 1 degree value
     if (value < 1.0) {
         value = 1.0;
     }
 
     m_referenceLineDensity = value;
 }
 
 float VanishingPointAssistant::referenceLineDensity()
 {
     return m_referenceLineDensity;
 }
 
 bool VanishingPointAssistant::isAssistantComplete() const
 {
     return handles().size() > 0; // only need one point to be ready
 }
 
 void VanishingPointAssistant::saveCustomXml(QXmlStreamWriter* xml)
 {
     xml->writeStartElement("angleDensity");
     xml->writeAttribute("value", KisDomUtils::toString( this->referenceLineDensity()));
     xml->writeEndElement();
 }
 
 bool VanishingPointAssistant::loadCustomXml(QXmlStreamReader* xml)
 {
     if (xml && xml->name() == "angleDensity") {
-         this->setReferenceLineDensity((float)KisDomUtils::toDouble(xml->attributes().value("value").toString()));
+        this->setReferenceLineDensity((float)KisDomUtils::toDouble(xml->attributes().value("value").toString()));
     }
 
     return true;
 }
 
 
 VanishingPointAssistantFactory::VanishingPointAssistantFactory()
 {
 }
 
 VanishingPointAssistantFactory::~VanishingPointAssistantFactory()
 {
 }
 
 QString VanishingPointAssistantFactory::id() const
 {
     return "vanishing point";
 }
 
 QString VanishingPointAssistantFactory::name() const
 {
     return i18n("Vanishing Point");
 }
 
 KisPaintingAssistant* VanishingPointAssistantFactory::createPaintingAssistant() const
 {
     return new VanishingPointAssistant;
 }