Page MenuHome
Files F11354

outlinersearch.patch
Public
Actions

outlinersearch.patch
View Options

Index: source/blender/editors/space_outliner/outliner.c
===================================================================
--- source/blender/editors/space_outliner/outliner.c (revision 31498)
+++ source/blender/editors/space_outliner/outliner.c (working copy)
@@ -561,7 +561,10 @@
TreeStoreElem *tselem;
ID *id= idv;
int a = 0;
-
+ /* Are we looking for something - we want to expand parents to filter child matches
+ - NOT in datablocks view - expanding all datablocks takes way too long to be useful */
+ int searching= (soops->search_string[0]!=0 && soops->outlinevis!=SO_DATABLOCKS);
+
if(ELEM3(type, TSE_RNA_STRUCT, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM)) {
id= ((PointerRNA*)idv)->id.data;
if(!id) id= ((PointerRNA*)idv)->data;
@@ -575,7 +578,11 @@
/* add to the storage */
check_persistant(soops, te, id, type, index);
tselem= TREESTORE(te);
-
+
+ /* if we are searching for something expand to see child elements
+ - user prefs need individual treatment later to not expand rna entries */
+ if(searching && soops->outlinevis!=SO_USERDEF) tselem->flag &= ~TSE_CLOSED;
+
te->parent= parent;
te->index= index; // for data arays
if(ELEM3(type, TSE_SEQUENCE, TSE_SEQ_STRIP, TSE_SEQUENCE_DUP));
@@ -1036,6 +1043,9 @@
else
te->name= (char*)RNA_struct_ui_name(ptr->type);
+ /* If searching don't expand RNA entries - it wil create infinite recursion */
+ if(searching && BLI_strcasecmp("RNA",te->name)!=0) tselem->flag &= ~TSE_CLOSED;
+
iterprop= RNA_struct_iterator_property(ptr->type);
tot= RNA_property_collection_length(ptr, iterprop);
@@ -1065,6 +1075,9 @@
te->directdata= prop;
te->rnaptr= *ptr;
+ /* If searching don't expand RNA entries - it wil create infinite recursion */
+ if(searching && BLI_strcasecmp("RNA",te->name)!=0) tselem->flag &= ~TSE_CLOSED;
+
if(proptype == PROP_POINTER) {
pptr= RNA_property_pointer_get(ptr, prop);

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
22/9b/72ea75fdcbdcb5690a792ec36b0f

Event Timeline