From 811634dedbfe7cde3e355b216a9569a7dd32dce3 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Sun, 18 Jun 2017 23:35:51 +0100 Subject: [PATCH] FEM: prerequisite checks, fix material reference shape type check --- src/Mod/Fem/FemTools.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Mod/Fem/FemTools.py b/src/Mod/Fem/FemTools.py index 9e56df493e..d2f209225f 100644 --- a/src/Mod/Fem/FemTools.py +++ b/src/Mod/Fem/FemTools.py @@ -363,9 +363,10 @@ class FemTools(QtCore.QRunnable, QtCore.QObject): has_no_references = True mat_ref_shty = '' for m in self.materials_linear: + ref_shty = get_refshape_type(m['Object']) if not mat_ref_shty: - mat_ref_shty = get_refshape_type(m['Object']) - if get_refshape_type(m['Object']) != mat_ref_shty: + mat_ref_shty = ref_shty + if mat_ref_shty and ref_shty and ref_shty != mat_ref_shty: # mat_ref_shty could be empty in one material, only the not empty ones should have the same shape type message += 'Some material objects do not have the same reference shape type (all material objects must have the same reference shape type, at the moment).\n' for m in self.materials_linear: mat_map = m['Object'].Material