From 3066e6b3d092ca007e49bb198c3755a3badd0391 Mon Sep 17 00:00:00 2001 From: Przemo Firszt Date: Wed, 15 Apr 2015 10:47:09 +0100 Subject: [PATCH] FEM: Use built-in None material if there was no previous material Adding material was using by default transient None material that has no properties assigned. If use accepted that type of material an attempt to write CalculiX input file was ending up with a crash. Using built-in None material prevents that situation. Reported-by: wmayer Signed-off-by: Przemo Firszt --- src/Mod/Fem/MechanicalMaterial.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Mod/Fem/MechanicalMaterial.py b/src/Mod/Fem/MechanicalMaterial.py index 59c62fd5e912..011205fee08a 100644 --- a/src/Mod/Fem/MechanicalMaterial.py +++ b/src/Mod/Fem/MechanicalMaterial.py @@ -138,9 +138,12 @@ def __init__(self, obj): previous_mat_path = self.get_material_path(self.previous_material) if not previous_mat_path: print "Previously used material cannot be found in material directories. Using transient material." - self.add_transient_material(self.previous_material) material_name = self.get_material_name(self.previous_material) - index = self.form.cb_materials.findData(material_name) + if material_name != 'None': + self.add_transient_material(self.previous_material) + index = self.form.cb_materials.findData(material_name) + else: + index = self.form.cb_materials.findText(material_name) self.chooseMat(index) else: index = self.form.cb_materials.findData(previous_mat_path)