From 7fe2e93dea540a33763f8aa3ce9e07df9bd18844 Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Fri, 28 May 2021 17:26:00 +1000 Subject: [PATCH] Fix #1491. Bug where drawings couldn't have a slash in their names. --- src/blenderbim/blenderbim/bim/module/drawing/operator.py | 2 +- src/blenderbim/blenderbim/bim/module/drawing/prop.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/blenderbim/blenderbim/bim/module/drawing/operator.py b/src/blenderbim/blenderbim/bim/module/drawing/operator.py index 121c239699..7d04b219d0 100644 --- a/src/blenderbim/blenderbim/bim/module/drawing/operator.py +++ b/src/blenderbim/blenderbim/bim/module/drawing/operator.py @@ -1059,7 +1059,7 @@ class RefreshDrawingList(bpy.types.Operator): continue if "IfcAnnotation/" in obj.name: new = bpy.context.scene.DocProperties.drawings.add() - new.name = obj.name.split("/")[1] + new.name = "/".join(obj.name.split("/")[1:]) new.camera = obj return {"FINISHED"} diff --git a/src/blenderbim/blenderbim/bim/module/drawing/prop.py b/src/blenderbim/blenderbim/bim/module/drawing/prop.py index 71abb3e6a0..b64a1dcba6 100644 --- a/src/blenderbim/blenderbim/bim/module/drawing/prop.py +++ b/src/blenderbim/blenderbim/bim/module/drawing/prop.py @@ -99,9 +99,11 @@ def updateDrawingName(self, context): return if self.camera.name == self.name: return - self.camera.name = "IfcGroup/{}".format(self.name) - self.camera.users_collection[0].name = self.camera.name - self.name = self.camera.name.split("/")[1] + self.camera.name = "IfcAnnotation/{}".format(self.name) + unique_name = "/".join(self.camera.name.split("/")[1:]) + self.camera.users_collection[0].name = "IfcGroup/{}".format(unique_name) + if self.name != unique_name: + self.name = unique_name def refreshActiveDrawingIndex(self, context):