blender
/
blender
136
411
Fork 593
Code Issues 6.3k Pull Requests 768 Projects 19 Wiki Activity

Fix #120058: Crash on undo rename in edit mode #120099

Closed
Jake wants to merge 1 commits from Jake-Faulkner/blender:Fix-120058 into main
pull from: Jake-Faulkner/blender:Fix-120058
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 5 Commits 1 Files Changed 1 +3 -2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/intern/lib_id.cc
View File

@ -2130,8 +2130,9 @@ void BKE_libblock_ensure_unique_name(Main *bmain, ID *id)
return;
}
/* BKE_id_new_name_validate also takes care of sorting. */
if (!ID_IS_LINKED(id) && BKE_id_new_name_validate(bmain, lb, id, nullptr, false)) {
if (!ID_IS_LINKED(id)) {
/* BKE_id_new_name_validate also takes care of sorting. */
BKE_id_new_name_validate(bmain, lb, id, nullptr, false);
bmain->is_memfile_undo_written = false;
}
}