diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-11-07 17:25:58 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-11-07 17:25:58 +0300 |
| commit | f34bf8a0cd4f3437f03c1894e507e1b8c2125b9d (patch) | |
| tree | c2aa098efe8fd9bf6433dca36ae3c5708fedfeb9 /source/blender/blenloader | |
| parent | 008d6987d0d2b0b2d3bc44c649b769c2d32d6f59 (diff) | |
Patch #4980, by Joshua Leung (aligorith)
This enables finding data in the Outliner.
Usage: Fkey (partial strings), CTRL+Fkey (partial strings, case sensitive).
SHIFT+Fkey to repeat a search, this cycles around.
Extra changes:
- button popups to enter strings now starts activated.
- outliner either shows for Armature the Bones, or Posechannels or
Editbones, depending the mode. Was needed to make searches meaningful.
Although Joshua did very good work on the key functions, there were a couple
of issues in his code, and problems in Outliner code, that didn't make it
all work nicely. So, this is quite a revised patch. :)
Full review log can be found in the patch tracker.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 1ce1f2c7237..675a8f7f81e 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -132,8 +132,8 @@ #include "BKE_texture.h" // for open_plugin_tex #include "BKE_utildefines.h" // SWITCH_INT DATA ENDB DNA1 O_BINARY GLOB USER TEST REND -#include "BIF_butspace.h" // for do_versions, patching event codes -#include "BIF_previewrender.h" // for struct RenderInfo +#include "BIF_butspace.h" // badlevel, for do_versions, patching event codes +#include "BIF_previewrender.h" // bedlelvel, for struct RenderInfo #include "BLO_readfile.h" #include "BLO_undofile.h" #include "BLO_readblenfile.h" // streaming read pipe, for BLO_readblenfile BLO_readblenfilememory @@ -3143,6 +3143,7 @@ static void lib_link_screen(FileData *fd, Main *main) } so->lockpoin= NULL; so->tree.first= so->tree.last= NULL; + so->search_tse.id= newlibadr(fd, NULL, so->search_tse.id); if(so->treestore) { tselem= so->treestore->data; @@ -3302,14 +3303,15 @@ void lib_link_screen_restore(Main *newmain, Scene *curscene) else if(sl->spacetype==SPACE_OOPS) { SpaceOops *so= (SpaceOops *)sl; Oops *oops; - int a; + oops= so->oops.first; while(oops) { oops->id= restore_pointer_by_name(newmain, (ID *)oops->id, 0); oops= oops->next; } so->lockpoin= NULL; + so->search_tse.id= restore_pointer_by_name(newmain, so->search_tse.id, 0); if(so->treestore) { TreeStore *ts= so->treestore; |