[Bf-extensions-cvs] [a674c1dd] master: BlenderKit: change group naming to collections

[Vilém Duha]

Commit: a674c1dd8644630e33bebed7ccd7a2454e576bde
Author: Vilém Duha
Date:   Sun Sep 29 00:04:48 2019 +0200
Branches: master
https://developer.blender.org/rBAa674c1dd8644630e33bebed7ccd7a2454e576bde

BlenderKit: change group naming to collections

===================================================================

M	blenderkit/__init__.py
M	blenderkit/append_link.py
M	blenderkit/download.py

===================================================================

diff --git a/blenderkit/__init__.py b/blenderkit/__init__.py
index 09ac0170..6f9a4ae6 100644
--- a/blenderkit/__init__.py
+++ b/blenderkit/__init__.py
@@ -1167,11 +1167,11 @@ class BlenderKitModelSearchProps(PropertyGroup, BlenderKitCommonSearchProps):
     append_method: EnumProperty(
         name="Import Method",
         items=(
-            ('LINK_GROUP', 'Link Group', ''),
+            ('LINK_COLLECTION', 'Link Collection', ''),
             ('APPEND_OBJECTS', 'Append Objects', ''),
         ),
         description="choose if the assets will be linked or appended",
-        default="LINK_GROUP"
+        default="LINK_COLLECTION"
     )
     append_link: EnumProperty(
         name="How to Attach",
diff --git a/blenderkit/append_link.py b/blenderkit/append_link.py
index 24c8caa0..b6bfb791 100644
--- a/blenderkit/append_link.py
+++ b/blenderkit/append_link.py
@@ -85,7 +85,7 @@ def append_scene(file_name, scenename=None, link=False, fake_user=False):
     return scene
 
 
-def link_group(file_name, obnames=[], location=(0, 0, 0), link=False, parent = None, **kwargs):
+def link_collection(file_name, obnames=[], location=(0, 0, 0), link=False, parent = None, **kwargs):
     '''link an instanced group - model type asset'''
     sel = utils.selection_get()
 
diff --git a/blenderkit/download.py b/blenderkit/download.py
index 6d65d919..468aea05 100644
--- a/blenderkit/download.py
+++ b/blenderkit/download.py
@@ -299,7 +299,7 @@ def append_asset(asset_data, **kwargs):  # downloaders=[], location=None,
         s = bpy.context.scene
         sprops = s.blenderkit_models
         # TODO this is here because combinations of linking objects or appending groups are rather not-userfull
-        if sprops.append_method == 'LINK_GROUP':
+        if sprops.append_method == 'LINK_COLLECTION':
             sprops.append_link = 'LINK'
             sprops.import_as = 'GROUP'
         else:
@@ -337,7 +337,7 @@ def append_asset(asset_data, **kwargs):  # downloaders=[], location=None,
                     return
 
                 if sprops.import_as == 'GROUP':
-                    parent, newobs = append_link.link_group(file_names[-1],
+                    parent, newobs = append_link.link_collection(file_names[-1],
                                                             location=downloader['location'],
                                                             rotation=downloader['rotation'],
                                                             link=link,
@@ -359,7 +359,7 @@ def append_asset(asset_data, **kwargs):  # downloaders=[], location=None,
 
         elif kwargs.get('model_location') is not None:
             if sprops.import_as == 'GROUP':
-                parent, newobs = append_link.link_group(file_names[-1],
+                parent, newobs = append_link.link_collection(file_names[-1],
                                                         location=kwargs['model_location'],
                                                         rotation=kwargs['model_rotation'],
                                                         link=link,