diff --git a/src/blenderbim/blenderbim/bim/module/brick/operator.py b/src/blenderbim/blenderbim/bim/module/brick/operator.py index 88a25b90b4..18b3e7bd4b 100644 --- a/src/blenderbim/blenderbim/bim/module/brick/operator.py +++ b/src/blenderbim/blenderbim/bim/module/brick/operator.py @@ -159,7 +159,7 @@ class AddBrickRelation(bpy.types.Operator, Operator): elif props.split_screen_toggled: object = props.split_screen_bricks[props.split_screen_active_brick_index].uri else: - object = props.new_brick_relation_namespace + props.new_brick_relation_object + object = props.namespace + props.new_brick_relation_object core.add_brick_relation( tool.Brick, brick_uri=brick.uri, diff --git a/src/blenderbim/blenderbim/bim/module/brick/prop.py b/src/blenderbim/blenderbim/bim/module/brick/prop.py index 01bffbfd61..ff96823a64 100644 --- a/src/blenderbim/blenderbim/bim/module/brick/prop.py +++ b/src/blenderbim/blenderbim/bim/module/brick/prop.py @@ -103,7 +103,6 @@ class BIMBrickProperties(PropertyGroup): brick_create_relations_toggled: BoolProperty(name="Brick Create Relations Toggled", default=False) brick_edit_relations_toggled: BoolProperty(name="Brick Edit Relations Toggled", default=False) new_brick_relation_type: EnumProperty(name="New Brick Relation Type", items=get_brick_relations) - new_brick_relation_namespace: EnumProperty(name="New Brick Relation Namespace", items=get_namespaces) new_brick_relation_object: StringProperty(name="New Brick Relation Object") add_relation_failed: BoolProperty(name="Add Relation Failed", default=False) # create relations split screen diff --git a/src/blenderbim/blenderbim/bim/module/brick/ui.py b/src/blenderbim/blenderbim/bim/module/brick/ui.py index b54d2dd0f7..c175ecb867 100644 --- a/src/blenderbim/blenderbim/bim/module/brick/ui.py +++ b/src/blenderbim/blenderbim/bim/module/brick/ui.py @@ -206,10 +206,6 @@ class BIM_PT_brickschema_viewport(Panel): row.operator("bim.remove_brick", text="", icon="X") if self.props.brick_create_relations_toggled: - row = self.layout.row(align=True) - row.label(text="Create Relation:") - - if self.props.brick_create_relations_toggled and self.props.new_brick_relation_type == "http://www.w3.org/2000/01/rdf-schema#label": row = self.layout.row(align=True) prop_with_search(row, self.props, "new_brick_relation_type", text="") row.prop(data=self.props, property="new_brick_relation_object", text="") @@ -225,15 +221,6 @@ class BIM_PT_brickschema_viewport(Panel): row.label(text=split_screen_selection.label if split_screen_selection.label else split_screen_selection.name) row.operator("bim.add_brick_relation", text="", icon="ADD") - elif self.props.brick_create_relations_toggled: - row = self.layout.row(align=True) - prop_with_search(row, self.props, "new_brick_relation_namespace", text="") - - row = self.layout.row(align=True) - prop_with_search(row, self.props, "new_brick_relation_type", text="") - row.prop(data=self.props, property="new_brick_relation_object", text="") - row.operator("bim.add_brick_relation", text="", icon="ADD") - if self.props.brick_create_relations_toggled and self.props.add_relation_failed: row = self.layout.row(align=True) row.label(text="Failed to find this entity!", icon="ERROR")