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-12-12 04:55:20 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-12-12 05:02:09 +0300
commit49490e5cfbeb2b0b823aa2042401891001870a6e (patch)
treea1d32562af2dea0c336ebd3d017a387834e936cc /source/blender/editors/space_outliner
parent16fc62e15f0a749d6d64e784ea048e07d6ea3397 (diff)
parente757c4a3bec8b0e8d198531a28327332af00a9ba (diff)
Merge branch 'master' into blender2.8
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.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c
index 6b4a7e10e63..d219457aeac 100644
--- a/source/blender/editors/space_outliner/outliner_collections.c
+++ b/source/blender/editors/space_outliner/outliner_collections.c
@@ -822,9 +822,9 @@ void OUTLINER_OT_collection_indirect_only_clear(wmOperatorType *ot)
}
/**
- * Populates the \param objects ListBase with all the outliner selected objects
+ * Populates the \param objects: ListBase with all the outliner selected objects
* We store it as (Object *)LinkData->data
- * \param objects expected to be empty
+ * \param objects: expected to be empty
*/
void ED_outliner_selected_objects_get(const bContext *C, ListBase *objects)
{
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index 60467854e73..f7f0d441138 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -213,7 +213,7 @@ void outliner_cleanup_tree(SpaceOops *soops)
* Free \a element and its sub-tree and remove its link in \a parent_subtree.
*
* \note Does not remove the TreeStoreElem of \a element!
- * \param parent_subtree Subtree of the parent element, so the list containing \a element.
+ * \param parent_subtree: Subtree of the parent element, so the list containing \a element.
*/
void outliner_free_tree_element(TreeElement *element, ListBase *parent_subtree)
{