diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2021-09-23 18:55:43 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2021-09-23 18:58:20 +0300 |
| commit | bd63944a739b4dcd49e8a65294ffb1b8a0a7b20b (patch) | |
| tree | 583d81aa9a9257ef96e69b20d18e760f42ffa839 /source/blender/blenkernel/intern/asset.cc | |
| parent | 942fc9f467c104150a474eb61a82957b5c9715f7 (diff) | |
UUID: place C++ code in correct namespace
Put the `bUUID` class in the `blender` namespace, instead of the
`blender::bke` namespace.
As a result, some C++ code now correctly uses the C++ class, where
previously it would use the C struct and use implicit casting where
necessary. As a result, support for initializer lists had to be
explicitly coded and in another place an explicit `::bUUID` was
necessary to avoid ambiguity.
Diffstat (limited to 'source/blender/blenkernel/intern/asset.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/asset.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/asset.cc b/source/blender/blenkernel/intern/asset.cc index ac9bcccc8bd..ae9ded3c754 100644 --- a/source/blender/blenkernel/intern/asset.cc +++ b/source/blender/blenkernel/intern/asset.cc @@ -126,7 +126,7 @@ void BKE_asset_metadata_catalog_id_clear(struct AssetMetaData *asset_data) } void BKE_asset_metadata_catalog_id_set(struct AssetMetaData *asset_data, - const bUUID catalog_id, + const ::bUUID catalog_id, const char *catalog_simple_name) { asset_data->catalog_id = catalog_id; |