diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2022-09-03 12:43:15 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2022-09-03 12:43:15 +0300 |
| commit | 4b818b151329516df55b5d9a1fbcc21ec3b73e7a (patch) | |
| tree | a93de83237013eed41bb731b367c7fcff3b07a68 | |
| parent | 0348bc88e4c1e26724d2469bab9f50c2ac5cf259 (diff) | |
| parent | a631dc55756b9c1a9835bf5b06f5d57f388f1277 (diff) | |
Merge branch 'blender-v3.3-release'
| -rw-r--r-- | source/blender/blenkernel/intern/attribute.cc | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_ops.cc | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/attribute.cc b/source/blender/blenkernel/intern/attribute.cc index 0f7fabcff9b..8524f340803 100644 --- a/source/blender/blenkernel/intern/attribute.cc +++ b/source/blender/blenkernel/intern/attribute.cc @@ -474,7 +474,7 @@ CustomDataLayer *BKE_id_attributes_active_get(ID *id) for (int i = 0; i < customdata->totlayer; i++) { CustomDataLayer *layer = &customdata->layers[i]; if (CD_MASK_PROP_ALL & CD_TYPE_AS_MASK(layer->type)) { - if (index == active_index) { + if (index == active_index && BKE_attribute_allow_procedural_access(layer->name)) { return layer; } index++; diff --git a/source/blender/editors/interface/interface_ops.cc b/source/blender/editors/interface/interface_ops.cc index 75f8ed26829..a42e08c59d5 100644 --- a/source/blender/editors/interface/interface_ops.cc +++ b/source/blender/editors/interface/interface_ops.cc @@ -1574,8 +1574,13 @@ static bool jump_to_target_button(bContext *C, bool poll) char *str_ptr = RNA_property_string_get_alloc( &ptr, prop, str_buf, sizeof(str_buf), nullptr); - int found = RNA_property_collection_lookup_string( - &coll_search->search_ptr, coll_search->search_prop, str_ptr, &target_ptr); + int found = 0; + /* Jump to target only works with search properties currently, not search callbacks yet. + * See ui_but_add_search. */ + if (coll_search->search_prop != NULL) { + found = RNA_property_collection_lookup_string( + &coll_search->search_ptr, coll_search->search_prop, str_ptr, &target_ptr); + } if (str_ptr != str_buf) { MEM_freeN(str_ptr); |