diff options
Diffstat (limited to 'source/blender/editors/space_outliner')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_edit.c | 23 | ||||
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_tree.c | 33 |
3 files changed, 36 insertions, 22 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 2d33c5db49d..f0dface1e32 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -100,7 +100,7 @@ static void outliner_width(SpaceOutliner *soops, ListBase *lb, int *w) { TreeElement *te = lb->first; while (te) { -// TreeStoreElem *tselem = TREESTORE(te); + // TreeStoreElem *tselem = TREESTORE(te); // XXX fixme... te->xend is not set yet if (!TSELEM_OPEN(tselem, soops)) { diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index 11d01931945..6cfb5ce8202 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -1296,8 +1296,8 @@ void OUTLINER_OT_scroll_page(wmOperatorType *ot) #if 0 /* find next element that has this name */ -static TreeElement *outliner_find_name(SpaceOutliner *soops, ListBase *lb, char *name, int flags, - TreeElement *prev, int *prevFound) +static TreeElement *outliner_find_name( + SpaceOutliner *soops, ListBase *lb, char *name, int flags, TreeElement *prev, int *prevFound) { TreeElement *te, *tes; @@ -1318,16 +1318,18 @@ static TreeElement *outliner_find_name(SpaceOutliner *soops, ListBase *lb, char } tes = outliner_find_name(soops, &te->subtree, name, flags, prev, prevFound); - if (tes) return tes; + if (tes) + return tes; } /* nothing valid found */ return NULL; } -static void outliner_find_panel(Scene *UNUSED(scene), ARegion *ar, SpaceOutliner *soops, int again, int flags) +static void outliner_find_panel( + Scene *UNUSED(scene), ARegion *ar, SpaceOutliner *soops, int again, int flags) { - ReportList *reports = NULL; // CTX_wm_reports(C); + ReportList *reports = NULL; // CTX_wm_reports(C); TreeElement *te = NULL; TreeElement *last_find; TreeStoreElem *tselem; @@ -1354,10 +1356,10 @@ static void outliner_find_panel(Scene *UNUSED(scene), ARegion *ar, SpaceOutliner else { /* pop up panel - no previous, or user didn't want search after previous */ name[0] = '\0'; -// XXX if (sbutton(name, 0, sizeof(name) - 1, "Find: ") && name[0]) { -// te = outliner_find_name(soops, &soops->tree, name, flags, NULL, &prevFound); -// } -// else return; /* XXX RETURN! XXX */ + // XXX if (sbutton(name, 0, sizeof(name) - 1, "Find: ") && name[0]) { + // te = outliner_find_name(soops, &soops->tree, name, flags, NULL, &prevFound); + // } + // else return; /* XXX RETURN! XXX */ } /* do selection and reveal */ @@ -1374,7 +1376,8 @@ static void outliner_find_panel(Scene *UNUSED(scene), ARegion *ar, SpaceOutliner /* make te->ys center of view */ ytop = (int)(te->ys + BLI_rctf_size_y(&ar->v2d.mask) / 2); - if (ytop > 0) ytop = 0; + if (ytop > 0) + ytop = 0; ar->v2d.cur.ymax = (float)ytop; ar->v2d.cur.ymin = (float)(ytop - BLI_rctf_size_y(&ar->v2d.mask)); diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index a03d9b6fb6d..6b24e83e8ee 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -372,9 +372,12 @@ static void outliner_add_object_contents(SpaceOutliner *soops, soops, &tenla1->subtree, ob, tenla1, TSE_CONSTRAINT, const_index); #if 0 /* disabled as it needs to be reworked for recoded constraints system */ target = get_constraint_target(con, &str); - if (str && str[0]) ten1->name = str; - else if (target) ten1->name = target->id.name + 2; - else ten1->name = con->name; + if (str && str[0]) + ten1->name = str; + else if (target) + ten1->name = target->id.name + 2; + else + ten1->name = con->name; #endif ten1->name = con->name; ten1->directdata = con; @@ -434,9 +437,12 @@ static void outliner_add_object_contents(SpaceOutliner *soops, ten = outliner_add_element(soops, &tenla->subtree, ob, tenla, TSE_CONSTRAINT, a); #if 0 /* disabled due to constraints system targets recode... code here needs review */ target = get_constraint_target(con, &str); - if (str && str[0]) ten->name = str; - else if (target) ten->name = target->id.name + 2; - else ten->name = con->name; + if (str && str[0]) + ten->name = str; + else if (target) + ten->name = target->id.name + 2; + else + ten->name = con->name; #endif ten->name = con->name; ten->directdata = con; @@ -1548,15 +1554,20 @@ static int treesort_obtype_alpha(const void *v1, const void *v2) else { /* 2nd we check ob type */ if (x1->idcode == ID_OB && x2->idcode == ID_OB) { - if (((Object *)x1->id)->type > ((Object *)x2->id)->type) return 1; - else if (((Object *)x1->id)->type > ((Object *)x2->id)->type) return -1; - else return 0; + if (((Object *)x1->id)->type > ((Object *)x2->id)->type) + return 1; + else if (((Object *)x1->id)->type > ((Object *)x2->id)->type) + return -1; + else + return 0; } else { int comp = strcmp(x1->name, x2->name); - if (comp > 0) return 1; - else if (comp < 0) return -1; + if (comp > 0) + return 1; + else if (comp < 0) + return -1; return 0; } } |