diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-27 16:49:59 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-27 16:49:59 +0300 |
| commit | 58adc586612e695d04033f2029362f279a9c05a4 (patch) | |
| tree | 0ebe8d1958f179e54a07eb44456002d46816a593 /source/blender/editors/space_outliner/outliner_collections.c | |
| parent | 0f6b2504f80edddc76c104e9df0722fbb7d484a7 (diff) | |
| parent | a247b53084760498ca81eb6bdb901dee8f3a02ca (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_collections.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_collections.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c index c1d86da3eab..c43f3d7eaf4 100644 --- a/source/blender/editors/space_outliner/outliner_collections.c +++ b/source/blender/editors/space_outliner/outliner_collections.c @@ -248,7 +248,7 @@ static TreeTraversalAction collection_find_data_to_edit(TreeElement *te, void *c } if (collection == BKE_collection_master(data->scene)) { - /* skip - showing warning/error message might be missleading + /* skip - showing warning/error message might be misleading * when deleting multiple collections, so just do nothing */ } else { @@ -601,7 +601,7 @@ static TreeTraversalAction layer_collection_find_data_to_edit(TreeElement *te, v LayerCollection *lc = te->directdata; if (lc->collection->flag & COLLECTION_IS_MASTER) { - /* skip - showing warning/error message might be missleading + /* skip - showing warning/error message might be misleading * when deleting multiple collections, so just do nothing */ } else { |