diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-06 19:17:10 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-06 19:17:10 +0300 |
| commit | 66a6d160fe26c1bac7a5dd4cd26cb5fbd5cf348e (patch) | |
| tree | 66d951c2819c2b713e454cdce6519cf72c7220e1 /source/blender/depsgraph | |
| parent | b28da9dbf81581454ecda8197f4b23574e495729 (diff) | |
Rename ID_IS_LINKED_DATABLOCK to ID_IS_LINKED.
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.
Diffstat (limited to 'source/blender/depsgraph')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 2 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index 5df85c19b6c..10da33fc0dd 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -380,7 +380,7 @@ void DepsgraphNodeBuilder::build_object(Scene *scene, Base *base, Object *ob) break; case OB_ARMATURE: /* Pose */ - if (ID_IS_LINKED_DATABLOCK(ob) && ob->proxy_from != NULL) { + if (ID_IS_LINKED(ob) && ob->proxy_from != NULL) { build_proxy_rig(ob); } else { diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index ebfd5d404db..3854850e778 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -518,7 +518,7 @@ void DepsgraphRelationBuilder::build_object(Main *bmain, Scene *scene, Object *o } case OB_ARMATURE: /* Pose */ - if (ID_IS_LINKED_DATABLOCK(ob) && ob->proxy_from != NULL) { + if (ID_IS_LINKED(ob) && ob->proxy_from != NULL) { build_proxy_rig(ob); } else { |