archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Rename ID_IS_LINKED_DATABLOCK to ID_IS_LINKED.

Browse Source 
This makes code closer to id_override/assent-engine ones, which
introduce a new type of linked data, and hence reserve
ID_IS_LINKED_DATABLOCK to real linked datablocks.
This commit is contained in:
Bastien Montagne
2017-11-06 17:17:10 +01:00
parent b28da9dbf8
commit 66a6d160fe
57 changed files with 160 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/object/object_data_transfer.c
View File

@@ -300,7 +300,7 @@ static void data_transfer_exec_preprocess_objects(
}
me = ob->data;
if (ID_IS_LINKED_DATABLOCK(me)) {
if (ID_IS_LINKED(me)) {
/* Do not transfer to linked data, not supported. */
BKE_reportf(op->reports, RPT_WARNING, "Skipping object '%s', linked data '%s' cannot be modified",
ob->id.name + 2, me->id.name + 2);
@@ -330,7 +330,7 @@ static bool data_transfer_exec_is_object_valid(
me->id.tag &= ~LIB_TAG_DOIT;
return true;
}
else if (!ID_IS_LINKED_DATABLOCK(me)) {
else if (!ID_IS_LINKED(me)) {
/* Do not transfer apply operation more than once. */
/* XXX This is not nice regarding vgroups, which are half-Object data... :/ */
BKE_reportf(op->reports, RPT_WARNING,
@@ -387,7 +387,7 @@ static int data_transfer_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
if (reverse_transfer && ID_IS_LINKED_DATABLOCK(ob_src->data)) {
if (reverse_transfer && ID_IS_LINKED(ob_src->data)) {
/* Do not transfer to linked data, not supported. */
return OPERATOR_CANCELLED;
}