From 9c20a29259b826b152e1c051182f96c97573c754 Mon Sep 17 00:00:00 2001 From: Pratik Borhade Date: Tue, 26 Sep 2023 17:26:26 +0200 Subject: [PATCH] Fix #112904: Outliner: Bones appear in different places in different modes c6b553d57cff4e6f2a9875c9c4e2468d17e277a5 added the bone collection in outliner. However, there is change in tree element order when switched between pose and edit/object mode. Because order of tree building is `edit bones -> bone collection -> pose bones` To keep tree structure consistent between different modes, first draw pose bone and then the ebone/bone collection. Pull Request: https://projects.blender.org/blender/blender/pulls/112908 --- .../editors/space_outliner/tree/tree_element_id_object.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/blender/editors/space_outliner/tree/tree_element_id_object.cc b/source/blender/editors/space_outliner/tree/tree_element_id_object.cc index 1bd382ca772..3468b36cae7 100644 --- a/source/blender/editors/space_outliner/tree/tree_element_id_object.cc +++ b/source/blender/editors/space_outliner/tree/tree_element_id_object.cc @@ -40,9 +40,8 @@ void TreeElementIDObject::expand(SpaceOutliner & /*space_outliner*/) const object_.id.newid = (ID *)(&legacy_te_); expand_animation_data(object_.adt); - - expand_data(); expand_pose(); + expand_data(); expand_materials(); expand_constraints(); expand_modifiers();