diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-19 09:21:15 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-19 09:21:15 +0300 |
| commit | c850320b35863edc35f0b0acd1c75ed48bb71542 (patch) | |
| tree | c3de2f92410308c0ece880a901864727b5731fc3 /source/blender/blenloader | |
| parent | 4d3d002b653c5b28320ada6b9d7f1e8c80bf944c (diff) | |
| parent | 7a24e0d175827824d139f7627de2a5af34d687fb (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 1cd82a8cd49..87f8b568023 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -10316,7 +10316,7 @@ static void give_base_to_objects( if (flag & FILE_AUTOSELECT) { /* Note that link_object_postprocess() already checks for FILE_AUTOSELECT flag, - * but it will miss objects from non-instanciated groups... */ + * but it will miss objects from non-instantiated groups... */ if (base->flag & BASE_SELECTABLED) { base->flag |= BASE_SELECTED; BKE_scene_object_base_flag_sync_from_base(base); |