diff options
Diffstat (limited to 'source/blender/makesrna/intern/rna_scene.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index ebec5e3bff8..bf97e4fcc0f 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -2514,7 +2514,7 @@ static const EnumPropertyItem *rna_UnitSettings_itemf_wrapper(const int system, { const void *usys; int len; - bUnit_GetSystem(system, type, &usys, &len); + BKE_unit_system_get(system, type, &usys, &len); EnumPropertyItem *items = NULL; int totitem = 0; @@ -2526,10 +2526,10 @@ static const EnumPropertyItem *rna_UnitSettings_itemf_wrapper(const int system, RNA_enum_item_add(&items, &totitem, &adaptive); for (int i = 0; i < len; i++) { - if (!bUnit_IsSuppressed(usys, i)) { + if (!BKE_unit_is_suppressed(usys, i)) { EnumPropertyItem tmp = {0}; - tmp.identifier = bUnit_GetIdentifier(usys, i); - tmp.name = bUnit_GetNameDisplay(usys, i); + tmp.identifier = BKE_unit_identifier_get(usys, i); + tmp.name = BKE_unit_display_name_get(usys, i); tmp.value = i; RNA_enum_item_add(&items, &totitem, &tmp); } @@ -2587,8 +2587,8 @@ static void rna_UnitSettings_system_update(Main *UNUSED(bmain), unit->mass_unit = USER_UNIT_ADAPTIVE; } else { - unit->length_unit = bUnit_GetBaseUnitOfType(unit->system, B_UNIT_LENGTH); - unit->mass_unit = bUnit_GetBaseUnitOfType(unit->system, B_UNIT_MASS); + unit->length_unit = BKE_unit_base_of_type_get(unit->system, B_UNIT_LENGTH); + unit->mass_unit = BKE_unit_base_of_type_get(unit->system, B_UNIT_MASS); } } |