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:
authorCampbell Barton <ideasman42@gmail.com>2018-05-20 09:52:10 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-05-20 09:52:56 +0300
commit12eb29fe355bc17dacf094e8e9d6edc1d8b877f0 (patch)
treeb4297f5992c2263dbc3f986f20bc3edad99af4b0 /source/blender/editors/space_outliner
parent96a3a628613bfd592aea5fcdfbb196bb61dfacb7 (diff)
Cleanup: whitespace, duplicate includes
Diffstat (limited to 'source/blender/editors/space_outliner')
-rw-r--r--source/blender/editors/space_outliner/outliner_collections.c4
-rw-r--r--source/blender/editors/space_outliner/outliner_tree.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c
index 9bb3871c247..c44345a168b 100644
--- a/source/blender/editors/space_outliner/outliner_collections.c
+++ b/source/blender/editors/space_outliner/outliner_collections.c
@@ -88,11 +88,11 @@ Collection *outliner_collection_from_tree_element(const TreeElement *te)
return lc->collection;
}
else if (ELEM(tselem->type, TSE_SCENE_COLLECTION_BASE, TSE_VIEW_COLLECTION_BASE)) {
- Scene *scene = (Scene*)tselem->id;
+ Scene *scene = (Scene *)tselem->id;
return BKE_collection_master(scene);
}
else if (tselem->type == 0 && te->idcode == ID_GR) {
- return (Collection*)tselem->id;
+ return (Collection *)tselem->id;
}
return NULL;
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index 58ab8f3735e..393b40d1097 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -1525,7 +1525,7 @@ BLI_INLINE void outliner_add_collection_objects(
}
static TreeElement *outliner_add_collection_recursive(
- SpaceOops *soops, Collection *collection, TreeElement *ten)
+ SpaceOops *soops, Collection *collection, TreeElement *ten)
{
outliner_add_collection_init(ten, collection);
@@ -1805,7 +1805,8 @@ static TreeElement *outliner_find_first_desired_element_at_y(
bool (*callback_test)(TreeElement *);
if ((soops->outlinevis == SO_VIEW_LAYER) &&
- (soops->filter & SO_FILTER_NO_COLLECTION)) {
+ (soops->filter & SO_FILTER_NO_COLLECTION))
+ {
callback_test = test_object_callback;
}
else {