From 7acdd87bf2660f27c2cb0fb97ed9accb95b45757 Mon Sep 17 00:00:00 2001
From: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date: Fri, 14 Dec 2018 17:15:28 +0100
Subject: [PATCH] fixes #3724

---
 src/Mod/PartDesign/Gui/ViewProviderLoft.cpp | 12 ++++++------
 src/Mod/PartDesign/Gui/ViewProviderPipe.cpp | 16 ++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp b/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp
index a1ad1692d6..ee081d8fc9 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp
@@ -127,9 +127,9 @@ void ViewProviderLoft::highlightReferences(const bool /*on*/, bool /*auxiliary*/
     Part::Feature* base;
     if(!auxiliary)
         base = static_cast<Part::Feature*>(pcLoft->Spine.getValue());
-    else 
+    else
         base = static_cast<Part::Feature*>(pcLoft->AuxillerySpine.getValue());
-    
+
     if (base == NULL) return;
     PartGui::ViewProviderPart* svp = dynamic_cast<PartGui::ViewProviderPart*>(
                 Gui::Application::Instance->getViewProvider(base));
@@ -138,10 +138,10 @@ void ViewProviderLoft::highlightReferences(const bool /*on*/, bool /*auxiliary*/
     std::vector<std::string> edges;
     if(!auxiliary)
         edges = pcLoft->Spine.getSubValuesStartsWith("Edge");
-    else 
+    else
         edges = pcLoft->AuxillerySpine.getSubValuesStartsWith("Edge");
 
-    if (on) {        
+    if (on) {
          if (!edges.empty() && originalLineColors.empty()) {
             TopTools_IndexedMapOfShape eMap;
             TopExp::MapShapes(base->Shape.getValue(), TopAbs_EDGE, eMap);
@@ -171,8 +171,8 @@ QIcon ViewProviderLoft::getIcon(void) const {
         str += QString::fromLatin1("Additive_");
     else
         str += QString::fromLatin1("Subtractive_");
- 
+
     str += QString::fromLatin1("Loft.svg");
-    return Gui::BitmapFactory().pixmap(str.toStdString().c_str());
+    return mergeTip(Gui::BitmapFactory().pixmap(str.toStdString().c_str()));
 }
 
diff --git a/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp b/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp
index 6e027ef496..4be7d6466f 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp
@@ -89,9 +89,9 @@ bool ViewProviderPipe::doubleClicked(void)
 }
 
 bool ViewProviderPipe::setEdit(int ModNum) {
-    if (ModNum == ViewProvider::Default ) 
+    if (ModNum == ViewProvider::Default )
         setPreviewDisplayMode(true);
-    
+
     return PartDesignGui::ViewProvider::setEdit(ModNum);
 }
 
@@ -129,9 +129,9 @@ void ViewProviderPipe::highlightReferences(const bool on, bool auxiliary)
     Part::Feature* base;
     if(!auxiliary)
         base = static_cast<Part::Feature*>(pcPipe->Spine.getValue());
-    else 
+    else
         base = static_cast<Part::Feature*>(pcPipe->AuxillerySpine.getValue());
-    
+
     if (base == NULL) return;
     PartGui::ViewProviderPart* svp = dynamic_cast<PartGui::ViewProviderPart*>(
                 Gui::Application::Instance->getViewProvider(base));
@@ -140,10 +140,10 @@ void ViewProviderPipe::highlightReferences(const bool on, bool auxiliary)
     std::vector<std::string> edges;
     if(!auxiliary)
         edges = pcPipe->Spine.getSubValuesStartsWith("Edge");
-    else 
+    else
         edges = pcPipe->AuxillerySpine.getSubValuesStartsWith("Edge");
 
-    if (on) {        
+    if (on) {
          if (!edges.empty() && originalLineColors.empty()) {
             TopTools_IndexedMapOfShape eMap;
             TopExp::MapShapes(base->Shape.getValue(), TopAbs_EDGE, eMap);
@@ -174,8 +174,8 @@ QIcon ViewProviderPipe::getIcon(void) const {
         str += QString::fromLatin1("Additive_");
     else
         str += QString::fromLatin1("Subtractive_");
- 
+
     str += QString::fromLatin1("Pipe.svg");
-    return Gui::BitmapFactory().pixmap(str.toStdString().c_str());
+    return mergeTip(Gui::BitmapFactory().pixmap(str.toStdString().c_str()));
 }