suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keep faces colors on boolean operations

Browse Source
This commit is contained in:
wmayer 2012-05-31 23:44:50 +02:00
parent 20fcef29c7
commit f2b4f5c18e
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Mod/Part/Gui/ViewProviderBoolean.cpp
View File

@ -124,10 +124,20 @@ void ViewProviderBoolean::updateData(const App::Property* prop)
applyColor(hist[0], colBase, colBool);
setColor = true;
}
else if (!colBase.empty() && colBase[0] != this->ShapeColor.getValue()) {
colBase.resize(baseMap.Extent(), colBase[0]);
applyColor(hist[0], colBase, colBool);
setColor = true;
}
if (colTool.size() == toolMap.Extent()) {
applyColor(hist[1], colTool, colBool);
setColor = true;
}
else if (!colTool.empty() && colTool[0] != this->ShapeColor.getValue()) {
colTool.resize(toolMap.Extent(), colTool[0]);
applyColor(hist[1], colTool, colBool);
setColor = true;
}
if (setColor)
this->DiffuseColor.setValues(colBool);
}
@ -187,6 +197,11 @@ void ViewProviderMultiFuse::updateData(const App::Property* prop)
applyColor(hist[index], colBase, colBool);
setColor = true;
}
else if (!colBase.empty() && colBase[0] != this->ShapeColor.getValue()) {
colBase.resize(baseMap.Extent(), colBase[0]);
applyColor(hist[index], colBase, colBool);
setColor = true;
}
}
if (setColor)
@ -248,6 +263,11 @@ void ViewProviderMultiCommon::updateData(const App::Property* prop)
applyColor(hist[index], colBase, colBool);
setColor = true;
}
else if (!colBase.empty() && colBase[0] != this->ShapeColor.getValue()) {
colBase.resize(baseMap.Extent(), colBase[0]);
applyColor(hist[index], colBase, colBool);
setColor = true;
}
}
if (setColor)