Commit: a70e941fd0f14a9ee4036c8053c1483f37a56af1
Author: Bastien Montagne
Date: Mon Jul 17 13:57:17 2017 +0200
Branches: id_copy_refactor
https://developer.blender.org/rBa70e941fd0f14a9ee4036c8053c1483f37a56af1
Some cosmetic renaming.
===================================================================
M source/blender/blenkernel/intern/library.c
M source/blender/blenkernel/intern/library_remap.c
M source/blender/blenloader/intern/writefile.c
M source/blender/makesdna/DNA_ID.h
===================================================================
diff --git a/source/blender/blenkernel/intern/library.c
b/source/blender/blenkernel/intern/library.c
index f288e963a2a..b9bf450542f 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -1206,13 +1206,13 @@ void BKE_libblock_copy_ex(Main *bmain, const ID *id, ID
**r_newid, const int fla
BKE_libblock_copy_data(bmain, idn, id, flag);
if ((flag & LIB_ID_COPY_NO_MAIN) != 0) {
- idn->tag |= LIB_TAG_FREE_NO_MAIN;
+ idn->tag |= LIB_TAG_NO_MAIN;
}
if ((flag & LIB_ID_COPY_NO_USER_REFCOUNT) != 0) {
- idn->tag |= LIB_TAG_FREE_NO_USER_REFCOUNT;
+ idn->tag |= LIB_TAG_NO_USER_REFCOUNT;
}
if ((flag & LIB_ID_COPY_NO_ALLOCATE) != 0) {
- idn->tag |= LIB_TAG_FREE_NOT_ALLOCATED;
+ idn->tag |= LIB_TAG_NOT_ALLOCATED;
}
if ((flag & LIB_ID_COPY_NO_DEG_TAG) == 0 && (flag &
LIB_ID_COPY_NO_MAIN) == 0) {
diff --git a/source/blender/blenkernel/intern/library_remap.c
b/source/blender/blenkernel/intern/library_remap.c
index e764df437e1..ed9063e7640 100644
--- a/source/blender/blenkernel/intern/library_remap.c
+++ b/source/blender/blenkernel/intern/library_remap.c
@@ -850,21 +850,21 @@ void BKE_id_free_ex(Main *bmain, void *idv, int flag,
const bool use_flag_from_i
ID *id = idv;
if (use_flag_from_idtag) {
- if ((id->tag & LIB_TAG_FREE_NO_MAIN) != 0) {
+ if ((id->tag & LIB_TAG_NO_MAIN) != 0) {
flag |= LIB_ID_FREE_NO_MAIN;
}
else {
flag &= ~LIB_ID_FREE_NO_MAIN;
}
- if ((id->tag & LIB_TAG_FREE_NO_USER_REFCOUNT) != 0) {
+ if ((id->tag & LIB_TAG_NO_USER_REFCOUNT) != 0) {
flag |= LIB_ID_FREE_NO_USER_REFCOUNT;
}
else {
flag &= ~LIB_ID_FREE_NO_USER_REFCOUNT;
}
- if ((id->tag & LIB_TAG_FREE_NOT_ALLOCATED) != 0) {
+ if ((id->tag & LIB_TAG_NOT_ALLOCATED) != 0) {
flag |= LIB_ID_FREE_NOT_ALLOCATED;
}
else {
diff --git a/source/blender/blenloader/intern/writefile.c
b/source/blender/blenloader/intern/writefile.c
index fbaaa91bc4d..6c5bfb01829 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -3842,7 +3842,7 @@ static bool write_file_handle(
for (; id; id = id->next) {
/* We should never attempt to write non-regular IDs
(i.e. all kind of temp/runtime ones). */
- BLI_assert((id->tag & (LIB_TAG_FREE_NO_MAIN |
LIB_TAG_FREE_NO_USER_REFCOUNT | LIB_TAG_FREE_NOT_ALLOCATED)) == 0);
+ BLI_assert((id->tag & (LIB_TAG_NO_MAIN |
LIB_TAG_NO_USER_REFCOUNT | LIB_TAG_NOT_ALLOCATED)) == 0);
switch ((ID_Type)GS(id->name)) {
case ID_WM:
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index b3690e7d179..a940e4bf65d 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -350,12 +350,12 @@ enum {
LIB_TAG_ANIM_NO_RECALC = 1 << 14,
LIB_TAG_ID_RECALC_ALL = (LIB_TAG_ID_RECALC | LIB_TAG_ID_RECALC_DATA),
- /* RESET_NEVER tag datablock for freeing behavior (usually set when
copying real one into temp/runtime one). */
- LIB_TAG_FREE_NO_MAIN = 1 << 16, /* Datablock is not listed in
Main database. */
- LIB_TAG_FREE_NO_USER_REFCOUNT = 1 << 17, /* Datablock does not
refcount usages of other IDs. */
+ /* RESET_NEVER tag datablock for freeing etc. behavior (usually set
when copying real one into temp/runtime one). */
+ LIB_TAG_NO_MAIN = 1 << 16, /* Datablock is not listed in Main
database. */
+ LIB_TAG_NO_USER_REFCOUNT = 1 << 17, /* Datablock does not refcount
usages of other IDs. */
/* Datablock was not allocated by standard system (BKE_libblock_alloc),
do not free its memory
* (usual type-specific freeing is called though). */
- LIB_TAG_FREE_NOT_ALLOCATED = 1 << 18,
+ LIB_TAG_NOT_ALLOCATED = 1 << 18,
};
/* To filter ID types (filter_id) */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
