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/draw/modes/object_mode.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/draw/modes/object_mode.c')
| -rw-r--r-- | source/blender/draw/modes/object_mode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index 3fb3183e808..ee2e8d6d236 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -1630,7 +1630,7 @@ static void DRW_shgroup_relationship_lines(OBJECT_StorageList *stl, Object *ob) static void DRW_shgroup_object_center(OBJECT_StorageList *stl, Object *ob, SceneLayer *sl, View3D *v3d) { - const bool is_library = ob->id.us > 1 || ID_IS_LINKED_DATABLOCK(ob); + const bool is_library = ob->id.us > 1 || ID_IS_LINKED(ob); DRWShadingGroup *shgroup; if (ob == OBACT_NEW(sl)) { |