Sunday merger of orange branch with bf-blender
[blender.git] / source / blender / src / outliner.c
index 077d43d7a5aa824578e03fba232b31f19711f810..4316c4837cf927c357795f03dd2f54f4336b8f71 100644 (file)
@@ -2584,8 +2584,12 @@ static void outliner_buttons(uiBlock *block, SpaceOops *soops, ListBase *lb)
 
                        // signal for button to open
                        addqueue(curarea->win, BUT_ACTIVATE, OL_NAMEBUTTON);
+                       
+                       /* otherwise keeps open on ESC */
+                       tselem->flag &= ~TSE_TEXTBUT;
                }
-               if((tselem->flag & TSE_CLOSED)==0) outliner_buttons(block, soops, &te->subtree);
+               else 
+                       if((tselem->flag & TSE_CLOSED)==0) outliner_buttons(block, soops, &te->subtree);
        }
 }