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

+ issue #0002525: Line color of shapes are always black

Browse Source
This commit is contained in:
wmayer 2016-05-06 13:57:13 +02:00
parent 4eada9a4f0
commit 7e01d0128b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Part/Gui/ViewProviderExt.cpp
View File

@ -350,17 +350,19 @@ void ViewProviderPartExt::onChanged(const App::Property* prop)
pcLineMaterial->diffuseColor.setValue(c.r,c.g,c.b); pcLineMaterial->diffuseColor.setValue(c.r,c.g,c.b);
if (c != LineMaterial.getValue().diffuseColor) if (c != LineMaterial.getValue().diffuseColor)
LineMaterial.setDiffuseColor(c); LineMaterial.setDiffuseColor(c);
LineColorArray.setValue(LineColor.getValue());
} }
else if (prop == &PointColor) { else if (prop == &PointColor) {
const App::Color& c = PointColor.getValue(); const App::Color& c = PointColor.getValue();
pcPointMaterial->diffuseColor.setValue(c.r,c.g,c.b); pcPointMaterial->diffuseColor.setValue(c.r,c.g,c.b);
if (c != PointMaterial.getValue().diffuseColor) if (c != PointMaterial.getValue().diffuseColor)
PointMaterial.setDiffuseColor(c); PointMaterial.setDiffuseColor(c);
PointColorArray.setValue(PointColor.getValue());
} }
else if (prop == &LineMaterial) { else if (prop == &LineMaterial) {
const App::Material& Mat = LineMaterial.getValue(); const App::Material& Mat = LineMaterial.getValue();
if (LineColor.getValue() != Mat.diffuseColor) if (LineColor.getValue() != Mat.diffuseColor)
LineColor.setValue(Mat.diffuseColor); LineColor.setValue(Mat.diffuseColor);
pcLineMaterial->ambientColor.setValue(Mat.ambientColor.r,Mat.ambientColor.g,Mat.ambientColor.b); pcLineMaterial->ambientColor.setValue(Mat.ambientColor.r,Mat.ambientColor.g,Mat.ambientColor.b);
pcLineMaterial->diffuseColor.setValue(Mat.diffuseColor.r,Mat.diffuseColor.g,Mat.diffuseColor.b); pcLineMaterial->diffuseColor.setValue(Mat.diffuseColor.r,Mat.diffuseColor.g,Mat.diffuseColor.b);
pcLineMaterial->specularColor.setValue(Mat.specularColor.r,Mat.specularColor.g,Mat.specularColor.b); pcLineMaterial->specularColor.setValue(Mat.specularColor.r,Mat.specularColor.g,Mat.specularColor.b);