diff options
author | Campbell Barton <campbell@blender.org> | 2022-08-28 13:52:28 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-08-28 13:52:28 +0300 |
commit | 28750bcf7e8b73d9da015898a3c0f21ef5d761f2 (patch) | |
tree | 45c9c2b24632d811fd6a4eca84a0a9818b9fc47b /source/blender/editors/space_outliner | |
parent | 7269ee4dbbc2d46eee864029772aa0e167cd267a (diff) |
Cleanup: replace NULL with nullptr for C++ files
Diffstat (limited to 'source/blender/editors/space_outliner')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_collections.cc | 4 | ||||
-rw-r--r-- | source/blender/editors/space_outliner/tree/tree_element_overrides.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_outliner/outliner_collections.cc b/source/blender/editors/space_outliner/outliner_collections.cc index 836ad3e3f93..440b77adefc 100644 --- a/source/blender/editors/space_outliner/outliner_collections.cc +++ b/source/blender/editors/space_outliner/outliner_collections.cc @@ -376,7 +376,7 @@ void outliner_collection_delete( const IDTypeInfo *id_type = BKE_idtype_get_info_from_id(&parent->id); BLI_assert(id_type->owner_get != nullptr); - ID *scene_owner = id_type->owner_get(bmain, &parent->id, NULL); + ID *scene_owner = id_type->owner_get(bmain, &parent->id, nullptr); BLI_assert(GS(scene_owner->name) == ID_SCE); if (ID_IS_LINKED(scene_owner) || ID_IS_OVERRIDE_LIBRARY(scene_owner)) { skip = true; @@ -609,7 +609,7 @@ static int collection_duplicate_exec(bContext *C, wmOperator *op) const IDTypeInfo *id_type = BKE_idtype_get_info_from_id(&parent->id); BLI_assert(id_type->owner_get != nullptr); - Scene *scene_owner = (Scene *)id_type->owner_get(bmain, &parent->id, NULL); + Scene *scene_owner = (Scene *)id_type->owner_get(bmain, &parent->id, nullptr); BLI_assert(scene_owner != nullptr); BLI_assert(GS(scene_owner->id.name) == ID_SCE); diff --git a/source/blender/editors/space_outliner/tree/tree_element_overrides.cc b/source/blender/editors/space_outliner/tree/tree_element_overrides.cc index 49cabd5117f..11067d37966 100644 --- a/source/blender/editors/space_outliner/tree/tree_element_overrides.cc +++ b/source/blender/editors/space_outliner/tree/tree_element_overrides.cc @@ -292,7 +292,7 @@ void OverrideRNAPathTreeBuilder::build_path(TreeElement &parent, PointerRNA idpoin; RNA_id_pointer_create(&override_data.id, &idpoin); - ListBase path_elems = {NULL}; + ListBase path_elems = {nullptr}; if (!RNA_path_resolve_elements(&idpoin, override_data.override_property.rna_path, &path_elems)) { return; } |