griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Remove unnecessary namespace specification

Browse Source
This commit is contained in:
Hans Goudey
2024-03-06 18:33:11 -05:00
parent 8c16d06858
commit d22a8b0a16
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/BKE_lib_remap.hh
View File

@@ -265,14 +265,14 @@ using IDTypeFilter = uint64_t;
namespace blender::bke::id {
class IDRemapper {
blender::Map<ID *, ID *> mappings_;
Map<ID *, ID *> mappings_;
IDTypeFilter source_types_ = 0;
/**
* Store all IDs using another ID with the 'NEVER_NULL' flag, which have (or
* should have been) remapped to `nullptr`.
*/
blender::Set<ID *> never_null_users_;
Set<ID *> never_null_users_;
public:
/**
@@ -326,7 +326,7 @@ class IDRemapper {
never_null_users_.add(id);
}
const blender::Set<ID *> &never_null_users(void) const
const Set<ID *> &never_null_users() const
{
return never_null_users_;
}
@@ -340,7 +340,7 @@ class IDRemapper {
}
/** Return a readable string for the given result. Can be used for debugging purposes. */
static const blender::StringRefNull result_to_string(const IDRemapperApplyResult result);
static const StringRefNull result_to_string(const IDRemapperApplyResult result);
/** Print out the rules inside the given id_remapper. Can be used for debugging purposes. */
void print(void) const;

2
source/blender/blenkernel/intern/lib_id_remapper.cc
View File

@@ -92,7 +92,7 @@ IDRemapperApplyResult IDRemapper::apply(ID **r_id_ptr,
return ID_REMAP_RESULT_SOURCE_REMAPPED;
}
const blender::StringRefNull IDRemapper::result_to_string(const IDRemapperApplyResult result)
const StringRefNull IDRemapper::result_to_string(const IDRemapperApplyResult result)
{
switch (result) {
case ID_REMAP_RESULT_SOURCE_NOT_MAPPABLE: