diff options
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_lib_id.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/lib_id.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenkernel/BKE_lib_id.h b/source/blender/blenkernel/BKE_lib_id.h index f46f946b284..36f57209e33 100644 --- a/source/blender/blenkernel/BKE_lib_id.h +++ b/source/blender/blenkernel/BKE_lib_id.h @@ -230,7 +230,7 @@ void id_us_plus(struct ID *id); void id_us_min(struct ID *id); void id_fake_user_set(struct ID *id); void id_fake_user_clear(struct ID *id); -void BKE_id_clear_newpoin(struct ID *id); +void BKE_id_newptr_and_tag_clear(struct ID *id); /** Flags to control make local code behavior. */ enum { diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c index 9db2df06e42..daafa587feb 100644 --- a/source/blender/blenkernel/intern/lib_id.c +++ b/source/blender/blenkernel/intern/lib_id.c @@ -336,7 +336,7 @@ void id_fake_user_clear(ID *id) } } -void BKE_id_clear_newpoin(ID *id) +void BKE_id_newptr_and_tag_clear(ID *id) { /* We assume that if this ID has no new ID, its embedded data has not either. */ if (id->newid == NULL) { @@ -349,16 +349,16 @@ void BKE_id_clear_newpoin(ID *id) /* Deal with embedded data too. */ Key *key = BKE_key_from_id(id); if (key != NULL) { - BKE_id_clear_newpoin(&key->id); + BKE_id_newptr_and_tag_clear(&key->id); } bNodeTree *ntree = ntreeFromID(id); if (ntree != NULL) { - BKE_id_clear_newpoin(&ntree->id); + BKE_id_newptr_and_tag_clear(&ntree->id); } if (GS(id->name) == ID_SCE) { Collection *master_collection = ((Scene *)id)->master_collection; if (master_collection != NULL) { - BKE_id_clear_newpoin(&master_collection->id); + BKE_id_newptr_and_tag_clear(&master_collection->id); } } } @@ -1782,7 +1782,7 @@ void BKE_main_id_newptr_and_tag_clear(Main *bmain) ID *id; FOREACH_MAIN_ID_BEGIN (bmain, id) { - BKE_id_clear_newpoin(id); + BKE_id_newptr_and_tag_clear(id); } FOREACH_MAIN_ID_END; } |