diff options
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_utils.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_utils.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/space_outliner/outliner_utils.c b/source/blender/editors/space_outliner/outliner_utils.c index 25dc7bc271e..8ec1db9a928 100644 --- a/source/blender/editors/space_outliner/outliner_utils.c +++ b/source/blender/editors/space_outliner/outliner_utils.c @@ -113,7 +113,7 @@ TreeElement *outliner_find_item_at_y(const SpaceOutliner *space_outliner, static TreeElement *outliner_find_item_at_x_in_row_recursive(const TreeElement *parent_te, float view_co_x, - bool *r_merged) + bool *row_merged) { TreeElement *child_te = parent_te->subtree.first; @@ -125,13 +125,13 @@ static TreeElement *outliner_find_item_at_x_in_row_recursive(const TreeElement * return child_te; } if ((child_te->flag & TE_ICONROW_MERGED) && over_element) { - if (r_merged) { - *r_merged = true; + if (row_merged) { + *row_merged = true; } return child_te; } - TreeElement *te = outliner_find_item_at_x_in_row_recursive(child_te, view_co_x, r_merged); + TreeElement *te = outliner_find_item_at_x_in_row_recursive(child_te, view_co_x, row_merged); if (te != child_te) { return te; } @@ -152,11 +152,11 @@ static TreeElement *outliner_find_item_at_x_in_row_recursive(const TreeElement * TreeElement *outliner_find_item_at_x_in_row(const SpaceOutliner *space_outliner, const TreeElement *parent_te, float view_co_x, - bool *r_merged) + bool *row_merged) { /* if parent_te is opened, it doesn't show children in row */ if (!TSELEM_OPEN(TREESTORE(parent_te), space_outliner)) { - return outliner_find_item_at_x_in_row_recursive(parent_te, view_co_x, r_merged); + return outliner_find_item_at_x_in_row_recursive(parent_te, view_co_x, row_merged); } return (TreeElement *)parent_te; |