diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-03-21 14:09:13 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-03-21 14:09:13 +0300 |
| commit | 37ee4d4e2a0afb403f6f3a4a5898d2cfe2a339c7 (patch) | |
| tree | bab6d76af3023860866fa0ea6e7f0a4ea5f2c4e5 /source/blender/editors/space_outliner/outliner_draw.c | |
| parent | d9356a5b8dfc9d63ffddc015c9e8a81db2a88b7e (diff) | |
| parent | d924e31b421a51fed343fbd2a17291cfd289d9bc (diff) | |
Merge branch 'master' into functions
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_draw.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 5d96c797409..838b86149dc 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -46,7 +46,7 @@ #include "BKE_deform.h" #include "BKE_fcurve.h" #include "BKE_gpencil.h" -#include "BKE_idcode.h" +#include "BKE_idtype.h" #include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_library.h" @@ -2831,7 +2831,7 @@ int tree_element_id_type_to_index(TreeElement *te) { TreeStoreElem *tselem = TREESTORE(te); - const int id_index = tselem->type == 0 ? BKE_idcode_to_index(te->idcode) : INDEX_ID_GR; + const int id_index = tselem->type == 0 ? BKE_idtype_idcode_to_index(te->idcode) : INDEX_ID_GR; if (id_index < INDEX_ID_OB) { return id_index; } |