diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-19 19:19:49 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-19 19:20:50 +0300 |
| commit | 6b433f4eb3da0acf092fb4e5417b10f9b304d073 (patch) | |
| tree | 17d66beede9df8d8b43f9db39265649c2d72e732 /release/scripts/startup/bl_ui/properties_object.py | |
| parent | a7d43eb1c6e1679d4bdf15a9f558f2dbf0fb5b24 (diff) | |
| parent | a4f2ebc78da4e10e65e864a16d2e621c7c79103d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_object.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_object.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index 1b49127be76..2dfbf2aa153 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -197,7 +197,7 @@ class OBJECT_PT_collections(ObjectButtonsPanel, Panel): obj_name = obj.name for collection in bpy.data.collections: - # XXX this is slow and stupid!, we need 2 checks, one thats fast + # XXX this is slow and stupid!, we need 2 checks, one that's fast # and another that we can be sure its not a name collision # from linked library data collection_objects = collection.objects |