From 0759436661692bd4d3b4d0d551291d550eccca38 Mon Sep 17 00:00:00 2001 From: hlg Date: Tue, 2 Jun 2020 17:07:06 +0200 Subject: [PATCH] Arch/Draft: minor fixes --- src/Mod/Arch/importSHP.py | 3 +-- src/Mod/Draft/draftutils/utils.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Mod/Arch/importSHP.py b/src/Mod/Arch/importSHP.py index 88786aaf2b..4938987841 100644 --- a/src/Mod/Arch/importSHP.py +++ b/src/Mod/Arch/importSHP.py @@ -72,8 +72,7 @@ def insert(filename,docname,record=None): translate("Arch","Shapes elevation"), translate("Arch","Choose which field provides shapes elevations:"), fields) - if reply[1]: - if record != "None": + if reply[1] and reply[0] != "None": record = reply[0] # build shapes diff --git a/src/Mod/Draft/draftutils/utils.py b/src/Mod/Draft/draftutils/utils.py index c7f8f9f8b8..8b80e204fd 100644 --- a/src/Mod/Draft/draftutils/utils.py +++ b/src/Mod/Draft/draftutils/utils.py @@ -561,7 +561,7 @@ def get_clone_base(obj, strict=False): if hasattr(obj, "CloneOf"): if obj.CloneOf: return get_clone_base(obj.CloneOf) - if get_type(obj) == "Clone": + if get_type(obj) == "Clone" and obj.Objects: return obj.Objects[0] if strict: return False