From bd63944a739b4dcd49e8a65294ffb1b8a0a7b20b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 23 Sep 2021 17:55:43 +0200 Subject: 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. --- source/blender/blenkernel/intern/asset.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/blenkernel/intern/asset.cc') 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; -- cgit v1.2.3