[Bf-blender-cvs] [1d5cc52ef6c] master: Cleanup: Rename `BKE_id_clear_newpoin` to `BKE_id_newptr_and_tag_clear`.

[Bastien Montagne]

Commit: 1d5cc52ef6c1e90ba0ddbd7f0440f20b96b2f321
Author: Bastien Montagne
Date:   Thu Sep 16 12:16:35 2021 +0200
Branches: master
https://developer.blender.org/rB1d5cc52ef6c1e90ba0ddbd7f0440f20b96b2f321

Cleanup: Rename `BKE_id_clear_newpoin` to `BKE_id_newptr_and_tag_clear`.

===================================================================

M	source/blender/blenkernel/BKE_lib_id.h
M	source/blender/blenkernel/intern/lib_id.c
M	source/blender/makesrna/intern/rna_ID.c

===================================================================

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;
 }
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c
index 9d8cea851e9..eb887e1881b 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -934,7 +934,7 @@ static struct ID *rna_ID_make_local(struct ID *self, Main *bmain, bool clear_pro
   BKE_lib_id_make_local(bmain, self, clear_proxy ? 0 : LIB_ID_MAKELOCAL_OBJECT_NO_PROXY_CLEARING);
 
   ID *ret_id = self->newid ? self->newid : self;
-  BKE_id_clear_newpoin(self);
+  BKE_id_newptr_and_tag_clear(self);
   return ret_id;
 }