diff --git a/src/Mod/Arch/ArchMaterial.py b/src/Mod/Arch/ArchMaterial.py index 9b7cad354..9fce6052d 100644 --- a/src/Mod/Arch/ArchMaterial.py +++ b/src/Mod/Arch/ArchMaterial.py @@ -237,10 +237,10 @@ class _ArchMaterialTaskPanel: def fillMaterialCombo(self): "fills the combo with the existing FCMat cards" - # look for cards in both resources dir and user folder. + # look for cards in both resources dir and a Materials sub-folder in the user folder. # User cards with same name will override system cards paths = [FreeCAD.getResourceDir() + os.sep + "Mod" + os.sep + "Material" + os.sep + "StandardMaterial"] - paths.append(FreeCAD.ConfigGet("UserAppData")) + paths.append(FreeCAD.ConfigGet("UserAppData") + os.sep + "Materials") self.cards = {} for p in paths: for f in os.listdir(p): diff --git a/src/Mod/Material/MaterialEditor.py b/src/Mod/Material/MaterialEditor.py index 6f6be8a70..449bf7485 100644 --- a/src/Mod/Material/MaterialEditor.py +++ b/src/Mod/Material/MaterialEditor.py @@ -93,10 +93,10 @@ class MaterialEditor(QtGui.QDialog): def updateCards(self): "updates the contents of the materials combo with existing material cards" - # look for cards in both resources dir and user folder. + # look for cards in both resources dir and a Materials sub-folder in the user folder. # User cards with same name will override system cards paths = [FreeCAD.getResourceDir() + os.sep + "Mod" + os.sep + "Material" + os.sep + "StandardMaterial"] - paths.append(FreeCAD.ConfigGet("UserAppData")) + paths.append(FreeCAD.ConfigGet("UserAppData") + os.sep + "Materials") self.cards = {} for p in paths: for f in os.listdir(p):