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

Arch: Fix in material reader

Browse Source
This commit is contained in:
Yorik van Havre
2020-01-31 13:49:31 +01:00
parent 94575bcd39
commit 6c59182d5d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Arch/ArchMaterial.py
View File

@@ -288,7 +288,7 @@ class _ArchMaterial:
d = obj.Material
if prop == "Material":
if "DiffuseColor" in obj.Material:
c = tuple([float(f) for f in obj.Material['DiffuseColor'].strip("()").split(",")])
c = tuple([float(f) for f in obj.Material['DiffuseColor'].strip("()").strip("[]").split(",")])
if hasattr(obj,"Color"):
if not self.isSameColor(obj.Color,c):
obj.Color = c
@@ -321,7 +321,7 @@ class _ArchMaterial:
elif prop == "Color":
if hasattr(obj,"Color"):
if "DiffuseColor" in d:
if self.isSameColor(tuple([float(f) for f in d['DiffuseColor'].strip("()").split(",")]),obj.Color[:3]):
if self.isSameColor(tuple([float(f) for f in d['DiffuseColor'].strip("()").strip("[]").split(",")]),obj.Color[:3]):
return
d["DiffuseColor"] = str(obj.Color[:3])
elif prop == "Transparency":
@@ -363,7 +363,7 @@ class _ArchMaterial:
if obj.Material:
if FreeCAD.GuiUp:
if "DiffuseColor" in obj.Material:
c = tuple([float(f) for f in obj.Material['DiffuseColor'].strip("()").split(",")])
c = tuple([float(f) for f in obj.Material['DiffuseColor'].strip("()").strip("[]").split(",")])
for p in obj.InList:
if hasattr(p,"Material") and ( (not hasattr(p.ViewObject,"UseMaterialColor")) or p.ViewObject.UseMaterialColor):
if p.Material.Name == obj.Name: