diff options
author | Benoit Bolsee <benoit.bolsee@online.be> | 2011-09-09 23:30:33 +0400 |
---|---|---|
committer | Benoit Bolsee <benoit.bolsee@online.be> | 2011-09-09 23:30:33 +0400 |
commit | 673552502bb2af1d78653bd7ce5a91e08403f41f (patch) | |
tree | 9af2a20a2cfc602af472a06210be2f6c2094494c /source/blender/makesdna | |
parent | ca170a8ed6745da4f9de5d2f5a1544571a2df783 (diff) | |
parent | 4b1a8d62e1b8f575bec87d12afc4d367468c1002 (diff) |
svn merge -r 40061:40078 https://svn.blender.org/svnroot/bf-blender/trunk/blendersoc-2010-nicks
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_outliner_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_outliner_types.h b/source/blender/makesdna/DNA_outliner_types.h index c44f10efde8..af19aa490ae 100644 --- a/source/blender/makesdna/DNA_outliner_types.h +++ b/source/blender/makesdna/DNA_outliner_types.h @@ -51,6 +51,8 @@ typedef struct TreeStore { #define TSE_CLOSED 1 #define TSE_SELECTED 2 #define TSE_TEXTBUT 4 +#define TSE_CHILDSEARCH 8 +#define TSE_SEARCHMATCH 16 /* TreeStoreElem types in BIF_outliner.h */ diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 66b10bcbf21..1627d4d2acb 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -861,6 +861,7 @@ enum { /* outliner search flags (SpaceOops->search_flags) */ #define SO_FIND_CASE_SENSITIVE (1<<0) #define SO_FIND_COMPLETE (1<<1) +#define SO_SEARCH_RECURSIVE (1<<2) /* headerbuttons: 450-499 */ |