From bec300e6b19a5c09c75442224287b2af2f63ed50 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Tue, 23 Apr 2019 09:13:06 +0200 Subject: [PATCH] FEM: material task panel, do not change mat card if mat editor was canceled --- .../Fem/femguiobjects/_ViewProviderFemMaterial.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py index d386e26e78..aff196016d 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py @@ -251,12 +251,14 @@ class _TaskPanelFemMaterial: # self.print_material_params(new_material_params) if new_material_params: # returns True if dict is not empty (do not use 'is True', this would return False for a non empty dict) self.material = new_material_params - self.check_material_keys() - self.set_mat_params_in_input_fields(self.material) - if self.has_transient_mat is False: - self.add_transient_material() + self.check_material_keys() + self.set_mat_params_in_input_fields(self.material) + if self.has_transient_mat is False: + self.add_transient_material() + else: + self.set_transient_material() else: - self.set_transient_material() + FreeCAD.Console.PrintMessage('No changes where made by the material editor.\n') # self.print_material_params() # material editor returns the mat_dict only not a card_path, if a standard FreeCAD mat_card was used