blender/blender
150
483
Fork 715
Code Issues 6.8k Pull Requests 880 Projects 17 Wiki Activity

Fix #118307: Outliner crash with additional constraint on overridden bone #118573

Closed
Philipp Oeser wants to merge 1 commits from lichtwerk/blender:118307 into blender-v4.1-release
pull from: lichtwerk/blender:118307
merge into: blender:blender-v4.1-release

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

8
source/blender/editors/space_outliner/tree/tree_element_overrides.cc
View File

@ -321,6 +321,7 @@ void OverrideRNAPathTreeBuilder::build_path(TreeElement &parent,
const char *elem_path = nullptr; const char *elem_path = nullptr;
TreeElement *te_to_expand = &parent; TreeElement *te_to_expand = &parent;
char name_buf[128], *name;
LISTBASE_FOREACH (PropertyElemRNA *, elem, &path_elems) { LISTBASE_FOREACH (PropertyElemRNA *, elem, &path_elems) {
if (!elem->next) { if (!elem->next) {
@ -339,8 +340,9 @@ void OverrideRNAPathTreeBuilder::build_path(TreeElement &parent,
if (RNA_property_type(elem->prop) == PROP_COLLECTION) { if (RNA_property_type(elem->prop) == PROP_COLLECTION) {
const int coll_item_idx = RNA_property_collection_lookup_index( const int coll_item_idx = RNA_property_collection_lookup_index(
&elem->ptr, elem->prop, &elem->next->ptr); &elem->ptr, elem->prop, &elem->next->ptr);
name = RNA_struct_name_get_alloc(&elem->next->ptr, name_buf, sizeof(name_buf), nullptr);
const char *coll_item_path = RNA_path_append( const char *coll_item_path = RNA_path_append(
previous_path, &elem->ptr, elem->prop, coll_item_idx, nullptr); previous_path, &elem->ptr, elem->prop, coll_item_idx, name);
te_to_expand = &ensure_label_element_for_ptr( te_to_expand = &ensure_label_element_for_ptr(
*te_to_expand, coll_item_path, elem->next->ptr, index); *te_to_expand, coll_item_path, elem->next->ptr, index);
@ -398,12 +400,14 @@ void OverrideRNAPathTreeBuilder::ensure_entire_collection(
TreeElement *previous_te = nullptr; TreeElement *previous_te = nullptr;
int item_idx = 0; int item_idx = 0;
char name_buf[128], *name;
RNA_PROP_BEGIN (&override_data.override_rna_ptr, itemptr, &override_data.override_rna_prop) { RNA_PROP_BEGIN (&override_data.override_rna_ptr, itemptr, &override_data.override_rna_prop) {
name = RNA_struct_name_get_alloc(&itemptr, name_buf, sizeof(name_buf), nullptr);
const char *coll_item_path = RNA_path_append(coll_prop_path, const char *coll_item_path = RNA_path_append(coll_prop_path,
&override_data.override_rna_ptr, &override_data.override_rna_ptr,
&override_data.override_rna_prop, &override_data.override_rna_prop,
item_idx, item_idx,
nullptr); name);
IDOverrideLibraryPropertyOperation *item_operation = IDOverrideLibraryPropertyOperation *item_operation =
BKE_lib_override_library_property_operation_find(&override_data.override_property, BKE_lib_override_library_property_operation_find(&override_data.override_property,
nullptr, nullptr,