blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Cleanup: Use LISTBASE_FOREACH macro in outliner code 

No functional changes.
This commit is contained in:
Nathan Craddock 2020-12-17 19:59:49 -07:00
parent f880fe2d66
commit 7cbcfb7f49
Notes: blender-bot 2023-02-14 03:46:57 +01:00 
Referenced by commit fdd84d36ce, Fix incorrect index-key in RNA path built from Outliner
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/space_outliner/outliner_draw.c
View File

@ -2928,8 +2928,6 @@ static void outliner_draw_iconrow(bContext *C,
/* closed tree element */
static void outliner_set_coord_tree_element(TreeElement *te, int startx, int starty)
{
TreeElement *ten;
/* closed items may be displayed in row of parent, don't change their coordinate! */
if ((te->flag & TE_ICONROW) == 0 && (te->flag & TE_ICONROW_MERGED) == 0) {
te->xs = 0;
@ -2937,7 +2935,7 @@ static void outliner_set_coord_tree_element(TreeElement *te, int startx, int sta
te->xend = 0;
}
for (ten = te->subtree.first; ten; ten = ten->next) {
LISTBASE_FOREACH (TreeElement *, ten, &te->subtree) {
outliner_set_coord_tree_element(ten, startx + UI_UNIT_X, starty);
}
}

7
source/blender/editors/space_outliner/outliner_edit.c
View File

@ -1253,8 +1253,7 @@ static void outliner_set_coordinates_element_recursive(SpaceOutliner *space_outl
*starty -= UI_UNIT_Y;
if (TSELEM_OPEN(tselem, space_outliner)) {
TreeElement *ten;
for (ten = te->subtree.first; ten; ten = ten->next) {
LISTBASE_FOREACH (TreeElement *, ten, &te->subtree) {
outliner_set_coordinates_element_recursive(space_outliner, ten, startx + UI_UNIT_X, starty);
}
}
@ -1753,7 +1752,7 @@ static void tree_element_to_path(TreeElement *te,
{
ListBase hierarchy = {NULL, NULL};
LinkData *ld;
TreeElement *tem, *temnext, *temsub;
TreeElement *tem, *temnext;
TreeStoreElem *tse /* , *tsenext */ /* UNUSED */;
PointerRNA *ptr, *nextptr;
PropertyRNA *prop;
@ -1823,7 +1822,7 @@ static void tree_element_to_path(TreeElement *te,
/* otherwise use index */
int index = 0;
for (temsub = tem->subtree.first; temsub; temsub = temsub->next, index++) {
LISTBASE_FOREACH (TreeElement *, temsub, &tem->subtree) {
if (temsub == temnext) {
break;
}