diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-06 20:02:46 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-06 20:02:46 +0300 |
| commit | 91af8f2ae2b5238839b57eaf74b0f950259ec57a (patch) | |
| tree | 1e7e775c9830041457cbb5771804b8bddfbeee3a /source/blender/blenkernel/intern/object_update.c | |
| parent | 9d77b5d5910b65bed88817169d5444cfb189eb63 (diff) | |
| parent | 66a6d160fe26c1bac7a5dd4cd26cb5fbd5cf348e (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
intern/cycles/device/device.cpp
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/material.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_relations.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/util/ed_util.c
source/blender/windowmanager/intern/wm_files_link.c
Diffstat (limited to 'source/blender/blenkernel/intern/object_update.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object_update.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c index 230a14796ac..665fc357a32 100644 --- a/source/blender/blenkernel/intern/object_update.c +++ b/source/blender/blenkernel/intern/object_update.c @@ -190,7 +190,7 @@ void BKE_object_handle_data_update( break; } case OB_ARMATURE: - if (ID_IS_LINKED_DATABLOCK(ob) && ob->proxy_from) { + if (ID_IS_LINKED(ob) && ob->proxy_from) { if (BKE_pose_copy_result(ob->pose, ob->proxy_from->pose) == false) { printf("Proxy copy error, lib Object: %s proxy Object: %s\n", ob->id.name + 2, ob->proxy_from->id.name + 2); @@ -280,7 +280,7 @@ void BKE_object_eval_uber_transform(const EvaluationContext *UNUSED(eval_ctx), // XXX: it's almost redundant now... /* Handle proxy copy for target, */ - if (ID_IS_LINKED_DATABLOCK(ob) && ob->proxy_from) { + if (ID_IS_LINKED(ob) && ob->proxy_from) { if (ob->proxy_from->proxy_group) { /* Transform proxy into group space. */ Object *obg = ob->proxy_from->proxy_group; |