tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Merge branch 'blender-v4.1-release'

This commit is contained in:
Sergey Sharybin 2024-02-23 12:33:11 +01:00
parent 428e67d7f9 63613e431e
commit 9b2c312ac7
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build_files/utils/make_update.py
View File

@ -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)

19
source/blender/editors/space_outliner/tree/tree_element_anim_data.cc
View File

@ -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<ID *>(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<ID *>(anim_data_.action),
nullptr,
&legacy_te_,
TSE_SOME_ID,
0);
}
expand_drivers();
expand_NLA_tracks();