[Bf-blender-cvs] [421b0bc4433] soc-2019-outliner: Outliner: Fix coordinates setting incorrectly on iconrow

[Nathan Craddock]

Commit: 421b0bc4433276fc9b605e744d93786c234d204f
Author: Nathan Craddock
Date:   Tue Jul 23 18:56:53 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rB421b0bc4433276fc9b605e744d93786c234d204f

Outliner: Fix coordinates setting incorrectly on iconrow

Iconrow coordinates were set incorrectly sometimes. It was a bad
condition check.

===================================================================

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 f3aeabcd0bc..570dd8e4c00 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -2914,7 +2914,7 @@ static void outliner_set_coord_tree_element(TreeElement *te, int startx, int sta
   TreeElement *ten;
 
   /* closed items may be displayed in row of parent, don't change their coordinate! */
-  if (!ELEM(te->flag, TE_ICONROW, TE_ICONROW_MERGED)) {
+  if ((te->flag & TE_ICONROW) == 0 && (te->flag & TE_ICONROW_MERGED) == 0) {
     /* store coord and continue, we need coordinatesfor elements outside view too */
     te->xs = startx;
     te->ys = starty;