Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_utils.c')
-rw-r--r--source/blender/editors/space_outliner/outliner_utils.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/editors/space_outliner/outliner_utils.c b/source/blender/editors/space_outliner/outliner_utils.c
index a120718e36b..9accf35784a 100644
--- a/source/blender/editors/space_outliner/outliner_utils.c
+++ b/source/blender/editors/space_outliner/outliner_utils.c
@@ -122,7 +122,7 @@ static TreeElement *outliner_find_item_at_x_in_row_recursive(const TreeElement *
if ((child_te->flag & TE_ICONROW) && over_element) {
return child_te;
}
- else if ((child_te->flag & TE_ICONROW_MERGED) && over_element) {
+ if ((child_te->flag & TE_ICONROW_MERGED) && over_element) {
if (r_merged) {
*r_merged = true;
}
@@ -409,9 +409,7 @@ bool outliner_is_element_visible(const TreeElement *te)
if (tselem->flag & TSE_CLOSED) {
return false;
}
- else {
- te = te->parent;
- }
+ te = te->parent;
}
return true;