Changeset View
Changeset View
Standalone View
Standalone View
source/blender/editors/space_outliner/outliner_draw.c
| Show First 20 Lines • Show All 1,515 Lines • ▼ Show 20 Lines | if (level < 1 || (tselem->type == 0 && te->idcode == ID_OB)) { | ||||
| else { | else { | ||||
| active = tree_element_active(C, scene, view_layer, soops, te, OL_SETSEL_NONE, false); | active = tree_element_active(C, scene, view_layer, soops, te, OL_SETSEL_NONE, false); | ||||
| } | } | ||||
| } | } | ||||
| else { | else { | ||||
| active = tree_element_type_active(C, scene, view_layer, soops, te, tselem, OL_SETSEL_NONE, false); | active = tree_element_type_active(C, scene, view_layer, soops, te, tselem, OL_SETSEL_NONE, false); | ||||
| } | } | ||||
| if (!ELEM(tselem->type, 0, TSE_LAYER_COLLECTION)) { | if (!ELEM(tselem->type, 0, TSE_LAYER_COLLECTION, TSE_R_LAYER)) { | ||||
| outliner_draw_iconrow_doit(block, te, fstyle, xmax, offsx, ys, alpha_fac, active, 1); | outliner_draw_iconrow_doit(block, te, fstyle, xmax, offsx, ys, alpha_fac, active, 1); | ||||
| } | } | ||||
| else { | else { | ||||
| const int index = tree_element_id_type_to_index(te); | const int index = tree_element_id_type_to_index(te); | ||||
| merged->num_elements[index]++; | merged->num_elements[index]++; | ||||
| if ((merged->tree_element[index] == NULL) || | if ((merged->tree_element[index] == NULL) || | ||||
| (active > merged->active[index])) | (active > merged->active[index])) | ||||
| { | { | ||||
| ▲ Show 20 Lines • Show All 712 Lines • Show Last 20 Lines | |||||