diff --git a/build_files/utils/make_update.py b/build_files/utils/make_update.py index c68ac2d8a46..b8b6a9132c7 100755 --- a/build_files/utils/make_update.py +++ b/build_files/utils/make_update.py @@ -555,9 +555,21 @@ def submodules_update(args: argparse.Namespace, branch: Optional[str]) -> str: msg += floating_libraries_update(args, branch) print("* Updating Git submodules") - exitcode = call((args.git_command, "submodule", "update", "--init"), exit_on_error=False) - if exitcode != 0: - msg += "Error updating Git submodules\n" + + submodule_directories = get_submodule_directories(args) + for submodule_path in submodule_directories: + if submodule_path.parts[0] == "lib" and args.no_libraries: + print(f"Skipping library submodule {submodule_path}") + continue + + if submodule_path.parts[0] == "tests" and not args.use_tests: + print(f"Skipping tests submodule {submodule_path}") + continue + + exitcode = call((args.git_command, "submodule", "update", "--init", submodule_path), + exit_on_error=False) + if exitcode != 0: + msg += f"Error updating Git submodule {submodule_path}\n" add_submodule_push_url(args) diff --git a/source/blender/editors/space_outliner/tree/tree_element_anim_data.cc b/source/blender/editors/space_outliner/tree/tree_element_anim_data.cc index efa4f41be43..b53598ea8af 100644 --- a/source/blender/editors/space_outliner/tree/tree_element_anim_data.cc +++ b/source/blender/editors/space_outliner/tree/tree_element_anim_data.cc @@ -31,17 +31,16 @@ TreeElementAnimData::TreeElementAnimData(TreeElement &legacy_te, AnimData &anim_ void TreeElementAnimData::expand(SpaceOutliner & /*space_outliner*/) const { - if (!anim_data_.action) { - return; - } - /* Animation data-block itself. */ - add_element(&legacy_te_.subtree, - reinterpret_cast(anim_data_.action), - nullptr, - &legacy_te_, - TSE_SOME_ID, - 0); + if (anim_data_.action) { + /* Animation data-block itself. */ + add_element(&legacy_te_.subtree, + reinterpret_cast(anim_data_.action), + nullptr, + &legacy_te_, + TSE_SOME_ID, + 0); + } expand_drivers(); expand_NLA_tracks();