Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / space_outliner / outliner_draw.c
index c2414ec6413e932a64c2bfce611bc53831bf79c8..62eda7d512872ca9629f134464770f8fb1a5806a 100644 (file)
@@ -634,7 +634,7 @@ static void outliner_draw_userbuts(uiBlock *block, ARegion *ar, SpaceOops *soops
                                char buf[16] = "";
                                int but_flag = UI_BUT_DRAG_LOCK;
 
-                               if (ID_IS_LINKED_DATABLOCK(id))
+                               if (ID_IS_LINKED(id))
                                        but_flag |= UI_BUT_DISABLED;
 
                                UI_block_emboss_set(block, UI_EMBOSS_NONE);
@@ -805,7 +805,7 @@ static void tselem_draw_icon_uibut(struct DrawIconArg *arg, int icon)
        else {
                uiBut *but = uiDefIconBut(arg->block, UI_BTYPE_LABEL, 0, icon, arg->xb, arg->yb, UI_UNIT_X, UI_UNIT_Y, NULL,
                                          0.0, 0.0, 1.0, arg->alpha,
-                                         (arg->id && ID_IS_LINKED_DATABLOCK(arg->id)) ? arg->id->lib->name : "");
+                                         (arg->id && ID_IS_LINKED(arg->id)) ? arg->id->lib->name : "");
                
                if (arg->id)
                        UI_but_drag_set_id(but, arg->id);
@@ -1443,7 +1443,7 @@ static void outliner_draw_tree_element(
                else
                        offsx += 2 * ufac;
                
-               if (tselem->type == 0 && ID_IS_LINKED_DATABLOCK(tselem->id)) {
+               if (tselem->type == 0 && ID_IS_LINKED(tselem->id)) {
                        if (tselem->id->tag & LIB_TAG_MISSING) {
                                UI_icon_draw_alpha((float)startx + offsx + 2 * ufac, (float)*starty + 2 * ufac, ICON_LIBRARY_DATA_BROKEN,
                                                   alpha_fac);