Changeset View
Changeset View
Standalone View
Standalone View
source/blender/editors/space_outliner/outliner_tree.c
| Show First 20 Lines • Show All 902 Lines • ▼ Show 20 Lines | TreeElement *outliner_add_element(SpaceOutliner *space_outliner, | ||||
| else if (type == TSE_ID_BASE) { | else if (type == TSE_ID_BASE) { | ||||
| /* pass */ | /* pass */ | ||||
| } | } | ||||
| else if (type == TSE_SOME_ID) { | else if (type == TSE_SOME_ID) { | ||||
| if (!te->type) { | if (!te->type) { | ||||
| BLI_assert(!"Expected this ID type to be ported to new Outliner tree-element design"); | BLI_assert(!"Expected this ID type to be ported to new Outliner tree-element design"); | ||||
| } | } | ||||
| } | } | ||||
| else if (ELEM(type, TSE_LIBRARY_OVERRIDE_BASE, TSE_LIBRARY_OVERRIDE)) { | |||||
| if (!te->type) { | |||||
| BLI_assert(!"Expected override types to be ported to new Outliner tree-element design"); | |||||
| } | |||||
| } | |||||
| else { | else { | ||||
| /* Other cases must be caught above. */ | /* Other cases must be caught above. */ | ||||
| BLI_assert(TSE_IS_REAL_ID(tselem)); | BLI_assert(TSE_IS_REAL_ID(tselem)); | ||||
| /* The new type design sets the name already, don't override that here. We need to figure out | /* The new type design sets the name already, don't override that here. We need to figure out | ||||
| * how to deal with the idcode for non-TSE_SOME_ID types still. Some rely on it... */ | * how to deal with the idcode for non-TSE_SOME_ID types still. Some rely on it... */ | ||||
| if (!te->type) { | if (!te->type) { | ||||
| te->name = id->name + 2; /* Default, can be overridden by Library or non-ID data. */ | te->name = id->name + 2; /* Default, can be overridden by Library or non-ID data. */ | ||||
| ▲ Show 20 Lines • Show All 411 Lines • ▼ Show 20 Lines | if (totelem > 1) { | ||||
| int skip = 0; | int skip = 0; | ||||
| for (te = lb->first; te; te = te->next, tp++) { | for (te = lb->first; te; te = te->next, tp++) { | ||||
| tselem = TREESTORE(te); | tselem = TREESTORE(te); | ||||
| tp->te = te; | tp->te = te; | ||||
| tp->name = te->name; | tp->name = te->name; | ||||
| tp->idcode = te->idcode; | tp->idcode = te->idcode; | ||||
| if ((tselem->type != TSE_SOME_ID) && tselem->type != TSE_DEFGROUP) { | if (!ELEM(tselem->type, TSE_SOME_ID, TSE_DEFGROUP)) { | ||||
| tp->idcode = 0; /* Don't sort this. */ | tp->idcode = 0; /* Don't sort this. */ | ||||
| } | } | ||||
| if (tselem->type == TSE_ID_BASE) { | if (tselem->type == TSE_ID_BASE) { | ||||
| tp->idcode = 1; /* Do sort this. */ | tp->idcode = 1; /* Do sort this. */ | ||||
| } | } | ||||
| tp->id = tselem->id; | tp->id = tselem->id; | ||||
| } | } | ||||
| ▲ Show 20 Lines • Show All 578 Lines • Show Last 20 Lines | |||||