Commit: 48fb7e96356f24dc5e20e8aa339d57de0f4f6e4d Author: Philippe Schmid Date: Mon Jan 22 12:04:28 2018 -0200 Branches: blender2.8 https://developer.blender.org/rB48fb7e96356f24dc5e20e8aa339d57de0f4f6e4d
T53831: Fixed vertical line alignment & expand Collection and Scene buttons position. This was fixed in master with commit 9d873fc3debe0. However, this fix never made it to 2.8. (The following merge (a96008f3aae2) did not import the fixes.) Note: This fix is ment to fix the alignment problem. I don't know if other parts of the code not merged are interesting or not. But if they are, they should be tackled separately. Reviewers: dfelinto Subscribers: venomgfx, dfelinto, raa, Severin Differential Revision: https://developer.blender.org/D3014 =================================================================== M source/blender/editors/space_outliner/outliner_draw.c =================================================================== diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 807a6555a01..1478792b38b 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -1422,11 +1422,7 @@ static void outliner_draw_tree_element( } else if (te->subtree.first || (tselem->type == 0 && te->idcode == ID_SCE) || (te->flag & TE_LAZY_CLOSED)) { /* open/close icon, only when sublevels, except for scene */ - int icon_x; - if (tselem->type == 0 && ELEM(te->idcode, ID_OB, ID_SCE)) - icon_x = startx; - else - icon_x = startx + 5 * ufac; + int icon_x = startx; // icons a bit higher if (TSELEM_OPEN(tselem, soops)) @@ -1814,7 +1810,7 @@ static void outliner_draw_tree( // gray hierarchy lines starty = (int)ar->v2d.tot.ymax - UI_UNIT_Y / 2 - OL_Y_OFFSET; - startx = 6; + startx = UI_UNIT_X / 2 - 1.0f; outliner_draw_hierarchy_lines(soops, &soops->tree, startx, &starty); // items themselves _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
