[Bf-blender-cvs] [516cfd22508] soc-2019-outliner: Outliner: Fix TreeStore loading in textbutton edit mode

[Nathan Craddock]

Commit: 516cfd225081cd551d08ebf2df44bdff4b7fc3e3
Author: Nathan Craddock
Date:   Mon Jun 17 21:01:48 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rB516cfd225081cd551d08ebf2df44bdff4b7fc3e3

Outliner: Fix TreeStore loading in textbutton edit mode

Fixes incorrectly added the TSE_ACTIVE flag field after TSE_SELECTED
because it logically made more sense there. Old files were loading
with each tree element in textbutton edit mode. This addresses that
and other issues with mismatches on TreeStoreElem flags.

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

M	source/blender/makesdna/DNA_outliner_types.h

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

diff --git a/source/blender/makesdna/DNA_outliner_types.h b/source/blender/makesdna/DNA_outliner_types.h
index 6fdb92ea496..5adeb5cd641 100644
--- a/source/blender/makesdna/DNA_outliner_types.h
+++ b/source/blender/makesdna/DNA_outliner_types.h
@@ -53,14 +53,14 @@ typedef struct TreeStore {
 enum {
   TSE_CLOSED = (1 << 0),
   TSE_SELECTED = (1 << 1),
-  TSE_ACTIVE = (1 << 2),
-  TSE_TEXTBUT = (1 << 3),
-  TSE_CHILDSEARCH = (1 << 4),
-  TSE_SEARCHMATCH = (1 << 5),
-  TSE_HIGHLIGHTED = (1 << 6),
-  TSE_DRAG_INTO = (1 << 7),
-  TSE_DRAG_BEFORE = (1 << 8),
-  TSE_DRAG_AFTER = (1 << 9),
+  TSE_TEXTBUT = (1 << 2),
+  TSE_CHILDSEARCH = (1 << 3),
+  TSE_SEARCHMATCH = (1 << 4),
+  TSE_HIGHLIGHTED = (1 << 5),
+  TSE_DRAG_INTO = (1 << 6),
+  TSE_DRAG_BEFORE = (1 << 7),
+  TSE_DRAG_AFTER = (1 << 8),
+  TSE_ACTIVE = (1 << 9),
   TSE_DRAG_ANY = (TSE_DRAG_INTO | TSE_DRAG_BEFORE | TSE_DRAG_AFTER),
 };