Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVilém Duha <vilda.novak@gmail.com>2019-09-10 17:46:55 +0300
committerVilém Duha <vilda.novak@gmail.com>2019-09-10 17:55:33 +0300
commiteb9bab0e7153fda8de113af9e3c54eca74c986ef (patch)
tree9dd25eaba596cd5f0de8c1889580b1bced977af8
parent59c96167877420714ce3cb66bf86fc91c2a3d4e7 (diff)
BlenderKit: one more fix for check if an asset was linked or appended
The state was written before first check, that's why always append was assumed to happen
-rw-r--r--blenderkit/download.py17
1 files changed, 10 insertions, 7 deletions
diff --git a/blenderkit/download.py b/blenderkit/download.py
index 379dcd6f..cb00341c 100644
--- a/blenderkit/download.py
+++ b/blenderkit/download.py
@@ -281,13 +281,7 @@ def append_asset(asset_data, **kwargs): # downloaders=[], location=None,
# link the group we are interested in( there are more groups in File!!!! , have to get the correct one!)
#
scene = bpy.context.scene
- scene['assets used'] = scene.get('assets used', {})
- scene['assets used'][asset_data['asset_base_id']] = asset_data.copy()
-
- scene['assets rated'] = scene.get('assets rated', {})
- id = asset_data['asset_base_id']
- scene['assets rated'][id] = scene['assets rated'].get(id, False)
user_preferences = bpy.context.preferences.addons['blenderkit'].preferences
@@ -433,6 +427,14 @@ def append_asset(asset_data, **kwargs): # downloaders=[], location=None,
parent = material
+ scene['assets used'] = scene.get('assets used', {})
+ scene['assets used'][asset_data['asset_base_id']] = asset_data.copy()
+
+ scene['assets rated'] = scene.get('assets rated', {})
+
+ id = asset_data['asset_base_id']
+ scene['assets rated'][id] = scene['assets rated'].get(id, False)
+
parent['asset_data'] = asset_data # TODO remove this??? should write to blenderkit Props?
# moving reporting to on save.
# report_use_success(asset_data['id'])
@@ -701,7 +703,8 @@ def asset_in_scene(asset_data):
scene = bpy.context.scene
au = scene.get('assets used', {})
- for id in au.keys():
+ id = asset_data['asset_base_id']
+ if id in au.keys():
ad = au[id]
if ad.get('file_name') != None: