diff options
| author | Michael Kowalski <makowalski@nvidia.com> | 2022-09-23 23:56:14 +0300 |
|---|---|---|
| committer | Michael Kowalski <makowalski@nvidia.com> | 2022-09-23 23:56:14 +0300 |
| commit | b2ad97ba97f3e55d1dd463e29ca0b2ec6fe761e1 (patch) | |
| tree | f94394835c6b731e4e379f4ef48fb78b4af4b9ca /source/blender/makesrna/intern/rna_access_compare_override.c | |
| parent | b31807c75f0c18c43ac6979e6da57dc9d420167a (diff) | |
| parent | 7e980f2b8cb96aa6d04dc72899d08473367eeeb9 (diff) | |
Merge branch 'master' into tmp-usd-alab-v2-T100452tmp-usd-alab-v2-T100452
Diffstat (limited to 'source/blender/makesrna/intern/rna_access_compare_override.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_access_compare_override.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_access_compare_override.c b/source/blender/makesrna/intern/rna_access_compare_override.c index d1df54df3cd..808578b4746 100644 --- a/source/blender/makesrna/intern/rna_access_compare_override.c +++ b/source/blender/makesrna/intern/rna_access_compare_override.c @@ -54,7 +54,7 @@ static CLG_LogRef LOG = {"rna.access_compare_override"}; * #RNA_find_real_ID_and_path, since in overrides we also consider shape keys as embedded data, not * only root node trees and master collections. */ -static ID *rna_property_override_property_real_id_owner(Main *bmain, +static ID *rna_property_override_property_real_id_owner(Main *UNUSED(bmain), PointerRNA *ptr, PropertyRNA *prop, char **r_rna_path) @@ -86,7 +86,7 @@ static ID *rna_property_override_property_real_id_owner(Main *bmain, case ID_GR: case ID_NT: /* Master collections, Root node trees. */ - owner_id = RNA_find_real_ID_and_path(bmain, id, &rna_path_prefix); + owner_id = RNA_find_real_ID_and_path(id, &rna_path_prefix); break; default: BLI_assert_unreachable(); |