kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #19636 from kadet1090/color-in-base

Browse Source 
Base: Move App::Color to Base
This commit is contained in:
Chris Hennes
2025-03-02 16:36:40 -06:00
committed by GitHub
parent f2a8bc92af 97de3de68f
commit 1a2070c36f
216 changed files with 1121 additions and 1055 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
View File

@@ -703,8 +703,8 @@ void ViewProviderFemPostObject::WriteColorData(bool ResetColorBarRange)
m_matPlainEdges->transparency.setNum(numPts);
float* transp = m_material->transparency.startEditing();
float* edgeTransp = m_matPlainEdges->transparency.startEditing();
App::Color c;
App::Color cEdge = EdgeColor.getValue();
Base::Color c;
Base::Color cEdge = EdgeColor.getValue();
for (int i = 0; i < numPts; i++) {
double value = 0;
@@ -930,7 +930,7 @@ void ViewProviderFemPostObject::onChanged(const App::Property* prop)
m_drawStyle->pointSize.setValue(PointSize.getValue());
}
else if (prop == &EdgeColor && setupPipeline()) {
App::Color c = EdgeColor.getValue();
Base::Color c = EdgeColor.getValue();
SbColor* edgeColor = m_matPlainEdges->diffuseColor.startEditing();
for (int i = 0; i < m_matPlainEdges->diffuseColor.getNum(); ++i) {
edgeColor[i].setValue(c.r, c.g, c.b);