diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-08-11 13:28:07 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-08-11 13:28:07 +0400 |
| commit | 2c2fa877be6a1e7f6f1abbb131d3706948368248 (patch) | |
| tree | fed2eaf68bf43edf399de836aa8c44624d3c2517 /source/blender/editors/space_outliner | |
| parent | 78f89c3bbf6c7faa3b364f75f7fd52d9f62762e6 (diff) | |
| parent | 99caa9470e9dc420541dc49c29037f6bac55964e (diff) | |
svn merge -r39286:39298 https://svn.blender.org/svnroot/bf-blender/trunk/blender, ensure some edits in trunk dont get merged back into pepper
Diffstat (limited to 'source/blender/editors/space_outliner')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 67d0e68c1c4..0cb05fa2115 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -66,6 +66,8 @@ #include "BKE_scene.h" #include "BKE_sequencer.h" +#include "BLI_ghash.h" + #include "ED_armature.h" #include "ED_object.h" #include "ED_screen.h" @@ -584,9 +586,10 @@ static void operator_call_cb(struct bContext *UNUSED(C), void *arg_kmi, void *ar static void operator_search_cb(const struct bContext *UNUSED(C), void *UNUSED(arg_kmi), const char *str, uiSearchItems *items) { - wmOperatorType *ot = WM_operatortype_first(); - - for(; ot; ot= ot->next) { + GHashIterator *iter= WM_operatortype_iter(); + + for( ; !BLI_ghashIterator_isDone(iter); BLI_ghashIterator_step(iter)) { + wmOperatorType *ot= BLI_ghashIterator_getValue(iter); if(BLI_strcasestr(ot->idname, str)) { char name[OP_MAX_TYPENAME]; @@ -598,6 +601,7 @@ static void operator_search_cb(const struct bContext *UNUSED(C), void *UNUSED(ar break; } } + BLI_ghashIterator_free(iter); } /* operator Search browse menu, open */ |