From db0db40efb3a6a8ff8d6475cd5f43425629bc18e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Thu, 14 Nov 2024 16:11:39 +0100 Subject: [PATCH] Fix #130232: Overlay Next: Relationship Lines on Instances Add missing conditional logic. --- .../draw/engines/overlay/overlay_next_relation.hh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/source/blender/draw/engines/overlay/overlay_next_relation.hh b/source/blender/draw/engines/overlay/overlay_next_relation.hh index 746ba7e66b9..33007d4db41 100644 --- a/source/blender/draw/engines/overlay/overlay_next_relation.hh +++ b/source/blender/draw/engines/overlay/overlay_next_relation.hh @@ -35,9 +35,11 @@ class Relations { { } - void begin_sync(Resources & /*res*/, const State &state) + void begin_sync(Resources &res, const State &state) { enabled_ = state.space_type == SPACE_VIEW3D; + enabled_ &= (state.v3d_flag & V3D_HIDE_HELPLINES) == 0; + enabled_ &= res.selection_type == SelectionType::DISABLED; points_buf_.clear(); relations_buf_.clear(); @@ -49,6 +51,11 @@ class Relations { return; } + /* Don't show object extras in set's. */ + if (ob_ref.object->base_flag & (BASE_FROM_SET | BASE_FROM_DUPLI)) { + return; + } + Object *ob = ob_ref.object; const float4 &relation_color = res.theme_settings.color_wire; const float4 &constraint_color = res.theme_settings.color_grid_axis_z; /* ? */