From 24bdf806e288243f658570e2d3a59cf899bdffe3 Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 11 Aug 2017 11:56:48 +0200 Subject: [PATCH] for fillet&chamfer copy transparency from base object --- src/Mod/Part/Gui/ViewProviderMirror.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/Mod/Part/Gui/ViewProviderMirror.cpp b/src/Mod/Part/Gui/ViewProviderMirror.cpp index 35da705c29..d690bd4105 100644 --- a/src/Mod/Part/Gui/ViewProviderMirror.cpp +++ b/src/Mod/Part/Gui/ViewProviderMirror.cpp @@ -254,19 +254,17 @@ void ViewProviderFillet::updateData(const App::Property* prop) std::vector colBase = static_cast(vpBase)->DiffuseColor.getValues(); std::vector colFill; colFill.resize(fillMap.Extent(), static_cast(vpBase)->ShapeColor.getValue()); + applyTransparency(static_cast(vpBase)->Transparency.getValue(),colBase); - bool setColor=false; if (static_cast(colBase.size()) == baseMap.Extent()) { applyColor(hist[0], colBase, colFill); - setColor = true; } else if (!colBase.empty() && colBase[0] != this->ShapeColor.getValue()) { colBase.resize(baseMap.Extent(), colBase[0]); applyColor(hist[0], colBase, colFill); - setColor = true; } - if (setColor) - this->DiffuseColor.setValues(colFill); + + this->DiffuseColor.setValues(colFill); } } } @@ -359,19 +357,17 @@ void ViewProviderChamfer::updateData(const App::Property* prop) std::vector colBase = static_cast(vpBase)->DiffuseColor.getValues(); std::vector colCham; colCham.resize(chamMap.Extent(), static_cast(vpBase)->ShapeColor.getValue()); + applyTransparency(static_cast(vpBase)->Transparency.getValue(),colBase); - bool setColor=false; if (static_cast(colBase.size()) == baseMap.Extent()) { applyColor(hist[0], colBase, colCham); - setColor = true; } else if (!colBase.empty() && colBase[0] != this->ShapeColor.getValue()) { colBase.resize(baseMap.Extent(), colBase[0]); applyColor(hist[0], colBase, colCham); - setColor = true; } - if (setColor) - this->DiffuseColor.setValues(colCham); + + this->DiffuseColor.setValues(colCham); } } }