From 55f316b0c9746b2be89bcbc62612759bd63c7d68 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Wed, 5 Jun 2019 08:09:48 +0200 Subject: [PATCH] FEM: material task panel, fix opening of material editor with material attributes without card --- src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py index f8ae8eb9d5..a21e5105ce 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py @@ -359,7 +359,13 @@ class _TaskPanelFemMaterial: def edit_material(self): # opens the material editor to choose a material or edit material params import MaterialEditor - new_material_params = MaterialEditor.editMaterial(card_path=self.card_path) + if self.card_path not in self.cards: + FreeCAD.Console.PrintLog( + 'Card path not in cards, material dict will be used to open Material Editor.\n' + ) + new_material_params = MaterialEditor.editMaterial(material=self.material) + else: + new_material_params = MaterialEditor.editMaterial(card_path=self.card_path) # material editor returns the mat_dict only, not a card_path # if the material editor was canceled a empty dict will be returned # do not change the self.material