diff options
Diffstat (limited to 'source/blender/editors/space_outliner')
7 files changed, 21 insertions, 9 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 9bdbcf6ed4e..6c8d95c22fd 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -2185,7 +2185,8 @@ void draw_outliner(const bContext *C) has_restrict_icons = false; } else { - /* width must take into account restriction columns (if visible) so that entries will still be visible */ + /* width must take into account restriction columns (if visible) + * so that entries will still be visible */ //outliner_width(soops, &soops->tree, &sizex); // XXX should use outliner_width instead when te->xend will be set correctly... outliner_rna_width(soops, &soops->tree, &sizex, 0); diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index 7926081c38d..37f41cbf207 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -486,7 +486,8 @@ static int outliner_id_remap_exec(bContext *C, wmOperator *op) /* recreate dependency graph to include new objects */ DEG_relations_tag_update(bmain); - /* free gpu materials, some materials depend on existing objects, such as lamps so freeing correctly refreshes */ + /* free gpu materials, some materials depend on existing objects, + * such as lamps so freeing correctly refreshes */ GPU_materials_free(bmain); WM_event_add_notifier(C, NC_WINDOW, NULL); @@ -705,7 +706,8 @@ void OUTLINER_OT_lib_relocate(wmOperatorType *ot) } /* XXX This does not work with several items - * (it is only called once in the end, due to the 'deferred' filebrowser invocation through event system...). */ + * (it is only called once in the end, due to the 'deferred' + * filebrowser invocation through event system...). */ void lib_relocate_cb( bContext *C, ReportList *UNUSED(reports), Scene *UNUSED(scene), TreeElement *te, TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void *UNUSED(user_data)) diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h index d6ebddf94e2..f8c32375bdf 100644 --- a/source/blender/editors/space_outliner/outliner_intern.h +++ b/source/blender/editors/space_outliner/outliner_intern.h @@ -92,7 +92,8 @@ typedef struct TreeElementIcon { #define TREESTORE_ID_TYPE(_id) \ (ELEM(GS((_id)->name), ID_SCE, ID_LI, ID_OB, ID_ME, ID_CU, ID_MB, ID_NT, ID_MA, ID_TE, ID_IM, ID_LT, ID_LA, ID_CA) || \ ELEM(GS((_id)->name), ID_KE, ID_WO, ID_SPK, ID_GR, ID_AR, ID_AC, ID_BR, ID_PA, ID_GD, ID_LS, ID_LP) || \ - ELEM(GS((_id)->name), ID_SCR, ID_WM, ID_TXT, ID_VF, ID_SO, ID_CF, ID_PAL, ID_MC, ID_WS, ID_MSK)) /* Only in 'blendfile' mode ... :/ */ + /* Only in 'blendfile' mode ... :/ */ \ + ELEM(GS((_id)->name), ID_SCR, ID_WM, ID_TXT, ID_VF, ID_SO, ID_CF, ID_PAL, ID_MC, ID_WS, ID_MSK)) /* TreeElement->flag */ enum { diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index a4bcb612e9e..1a84d6bd142 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -304,7 +304,8 @@ static eOLDrawState tree_element_set_active_object( /* Only in object mode so we can switch the active object, * keeping all objects in the current 'mode' selected, useful for multi-pose/edit mode. - * This keeps the convention that all objects in the current mode are also selected. see T55246. */ + * This keeps the convention that all objects in the current mode are also selected. + * see T55246. */ if ((scene->toolsettings->object_flag & SCE_OBJECT_MODE_LOCK) ? (ob->mode == OB_MODE_OBJECT) : true) { BKE_view_layer_base_deselect_all(view_layer); } diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index 5df9d5f4ac4..10d2e15505e 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -779,7 +779,10 @@ static void constraint_cb(int event, TreeElement *te, TreeStoreElem *UNUSED(tsel if (BKE_constraint_remove_ex(lb, ob, constraint, true)) { /* there's no active constraint now, so make sure this is the case */ BKE_constraints_active_set(&ob->constraints, NULL); - ED_object_constraint_update(bmain, ob); /* needed to set the flags on posebones correctly */ + + /* needed to set the flags on posebones correctly */ + ED_object_constraint_update(bmain, ob); + WM_event_add_notifier(C, NC_OBJECT | ND_CONSTRAINT | NA_REMOVED, ob); te->store_elem->flag &= ~TSE_SELECTED; } diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 9ac96cf4929..f069c259dd1 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -1935,7 +1935,8 @@ void outliner_build_tree(Main *mainvar, Scene *scene, ViewLayer *view_layer, Spa { TreeElement *te = NULL, *ten; TreeStoreElem *tselem; - int show_opened = !soops->treestore || !BLI_mempool_len(soops->treestore); /* on first view, we open scenes */ + /* on first view, we open scenes */ + int show_opened = !soops->treestore || !BLI_mempool_len(soops->treestore); /* Are we looking for something - we want to tag parents to filter child matches * - NOT in datablocks view - searching all datablocks takes way too long to be useful diff --git a/source/blender/editors/space_outliner/outliner_utils.c b/source/blender/editors/space_outliner/outliner_utils.c index 6b7035dd326..081fa9f9e94 100644 --- a/source/blender/editors/space_outliner/outliner_utils.c +++ b/source/blender/editors/space_outliner/outliner_utils.c @@ -73,10 +73,13 @@ TreeElement *outliner_find_item_at_y(const SpaceOops *soops, const ListBase *tre */ TreeElement *outliner_find_item_at_x_in_row(const SpaceOops *soops, const TreeElement *parent_te, float view_co_x) { - if (!TSELEM_OPEN(TREESTORE(parent_te), soops)) { /* if parent_te is opened, it doesn't show childs in row */ + /* if parent_te is opened, it doesn't show childs in row */ + if (!TSELEM_OPEN(TREESTORE(parent_te), soops)) { /* no recursion, items can only display their direct children in the row */ for (TreeElement *child_te = parent_te->subtree.first; - child_te && view_co_x >= child_te->xs; /* don't look further if co_x is smaller than child position*/ + /* don't look further if co_x is smaller than child position*/ + child_te && view_co_x >= child_te->xs; + child_te = child_te->next) { if ((child_te->flag & TE_ICONROW) && (view_co_x > child_te->xs) && (view_co_x < child_te->xend)) { |