blender
/
blender
136
407
Fork 590
Code Issues 6.3k Pull Requests 783 Projects 19 Wiki Activity

Fix #90732: crash on alt+LMB to change custom properties in some cases #112910

Closed
Philipp Oeser wants to merge 1 commits from lichtwerk/blender:90732_b into blender-v4.0-release
pull from: lichtwerk/blender:90732_b
merge into: blender:blender-v4.0-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 +17
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/editors/interface/interface_ops.cc
View File

@ -1346,6 +1346,7 @@ bool UI_context_copy_to_selected_list(bContext *C,
return false;
}
/* Account for properties only being available for some sequence types. */
if (ensure_list_items_contain_prop) {
const char *prop_id = RNA_property_identifier(prop);
LISTBASE_FOREACH_MUTABLE (CollectionPointerLink *, link, r_lb) {
@ -1358,6 +1359,19 @@ bool UI_context_copy_to_selected_list(bContext *C,
}
}
/* Similarly account for custom properties only being available for some members in selection. */
if (RNA_property_is_idprop(prop)) {
PointerRNA dummy_ptr;
PropertyRNA *dummy_prop;
const char *prop_py = RNA_path_property_py(ptr, prop, -1);
LISTBASE_FOREACH_MUTABLE (CollectionPointerLink *, link, r_lb) {
if (!RNA_path_resolve_property(&link->ptr, prop_py, &dummy_ptr, &dummy_prop)) {
BLI_remlink(r_lb, link);
MEM_freeN(link);
}
}
}
return true;
}
@ -1388,6 +1402,9 @@ bool UI_context_copy_to_selected_check(PointerRNA *ptr,
RNA_path_resolve_property(ptr_link, path, &lptr, &lprop);
}
else {
/* This assumes the property is valid on link (not necessarily the case for custom properties
* on e.g. bones though). But non-existing custom properties get filtered out in
* UI_context_copy_to_selected_list(). */
lptr = *ptr_link;
lprop = prop;
}