diff options
author | Vilém Duha <vilda.novak@gmail.com> | 2020-12-22 16:45:40 +0300 |
---|---|---|
committer | Vilém Duha <vilda.novak@gmail.com> | 2020-12-22 16:45:51 +0300 |
commit | 10ae0f7a5a84b0d9ac8ccbb4abe97e42ab6ca9d1 (patch) | |
tree | b742a78c088cd9baa7d1252054f5595f700dbc4b /blenderkit/resolutions.py | |
parent | 105d485a0327976e12b34f23373079b3b2c4d834 (diff) |
BlenderKit: multiple improvements:
HDR and scene asset types - These are now available when user enables experimental features in addon preferences.
Refactor Upload - no Blender instance isn't launched when not needed and everything happens in a thread, so no waiting for the user when e.g. updating metadata.
improve pasted asset_id string
Change asset type picking interface to fit more asset types
Notify user about brush mode needs
Update categories file
Diffstat (limited to 'blenderkit/resolutions.py')
-rw-r--r-- | blenderkit/resolutions.py | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/blenderkit/resolutions.py b/blenderkit/resolutions.py index 89ddb6d6..a3de18ee 100644 --- a/blenderkit/resolutions.py +++ b/blenderkit/resolutions.py @@ -179,13 +179,6 @@ def save_image_safely(teximage, filepath): orig_color_mode = ims.color_mode orig_compression = ims.compression - ims = rs.image_settings - - orig_file_format = ims.file_format - orig_quality = ims.quality - orig_color_mode = ims.color_mode - orig_compression = ims.compression - ims.file_format = teximage.file_format if teximage.file_format == 'PNG': ims.color_mode = 'RGBA' @@ -317,6 +310,7 @@ def upload_resolutions(files, data): preferences = bpy.context.preferences.addons['blenderkit'].preferences upload_data = { + "name": data['asset_data']['name'], "token": preferences.api_key, "id": data['asset_data']['id'] } @@ -743,18 +737,19 @@ def iterate_for_resolutions(filepath, process_count=12, api_key=''): if check_needs_resolutions(asset_data): print('downloading and generating resolution for %s' % asset_data['name']) # this is just a quick hack for not using original dirs in blendrkit... - thread = threading.Thread(target=generate_resolution_thread, args=(asset_data, api_key)) - thread.start() - - threads.append(thread) - print('processes ', len(threads)) - while len(threads) > process_count - 1: - for proc in threads: - if not proc.is_alive(): - threads.remove(proc) - break; - else: - print(f'Failed to retrieve asset from server:{asset_data["name"]}') + generate_resolution_thread(asset_data,api_key) + # thread = threading.Thread(target=generate_resolution_thread, args=(asset_data, api_key)) + # thread.start() + # + # threads.append(thread) + # print('processes ', len(threads)) + # while len(threads) > process_count - 1: + # for t in threads: + # if not t.is_alive(): + # threads.remove(t) + # break; + # else: + # print(f'Failed to generate resolution:{asset_data["name"]}') else: print('not generated resolutions:', asset_data['name']) |