Merge branch 'master' into blender2.8

2018-09-19 18:19:49 +02:00
parent a7d43eb1c6 a4f2ebc78d
commit 6b433f4eb3
92 changed files with 141 additions and 141 deletions
--- 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