From 5ac1dd797164cd3e3e8ce5acdfde93530fb959ac Mon Sep 17 00:00:00 2001 From: "Zheng, Lei" Date: Mon, 4 Dec 2017 16:08:02 +0800 Subject: [PATCH] assembly: material override in ElementLink Original override point is ViewProviderAsmConstraint, which will override any material setting in ViewProviderAsmElementLink. It's better to default override at the bottom hierarchy. --- assembly.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/assembly.py b/assembly.py index 130616c..3caf399 100644 --- a/assembly.py +++ b/assembly.py @@ -778,6 +778,15 @@ def setPlacement(part,pla,undoDocs,undoName=None): class ViewProviderAsmElementLink(ViewProviderAsmOnTop): + def __init__(self,vobj): + vobj.OverrideMaterial = True + vobj.ShapeMaterial.DiffuseColor = self.getDefaultColor() + vobj.ShapeMaterial.EmissiveColor = self.getDefaultColor() + super(ViewProviderAsmElementLink,self).__init__(vobj) + + def getDefaultColor(self): + return (1.0,60.0/255.0,60.0/255.0) + def doubleClicked(self,_vobj): return movePart() @@ -1021,15 +1030,6 @@ class AsmConstraint(AsmGroup): class ViewProviderAsmConstraint(ViewProviderAsmGroup): - def __init__(self,vobj): - vobj.OverrideMaterial = True - vobj.ShapeMaterial.DiffuseColor = self.getDefaultColor() - vobj.ShapeMaterial.EmissiveColor = self.getDefaultColor() - super(ViewProviderAsmConstraint,self).__init__(vobj) - - def getDefaultColor(self): - return (1.0,60.0/255.0,60.0/255.0) - def getIcon(self): return Constraint.getIcon(self.ViewObject.Object)