From 0cf887278e274324fddd70a1e2e9585ec00558db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vil=C3=A9m=20Duha?= <vilda.novak@gmail.com> Date: Tue, 22 Dec 2020 18:33:40 +0100 Subject: [PATCH] BlenderKit: category layout for fast category editing tool and fix for HDR thumbnail generation code - still not perfect but sets view transform to raw during .jpg save and this causesthe image to look closer. If it will be displayed as linear or non-color in asset bar, it will fit perfectly. --- blenderkit/image_utils.py | 6 +++++- blenderkit/upload.py | 16 +++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/blenderkit/image_utils.py b/blenderkit/image_utils.py index b2ade8044..5e2b93bfe 100644 --- a/blenderkit/image_utils.py +++ b/blenderkit/image_utils.py @@ -31,17 +31,21 @@ def set_orig_render_settings(orig_settings): vs.view_transform = orig_settings['view_transform'] -def img_save_as(img, filepath='//', file_format='JPEG', quality=90, color_mode='RGB', compression=15): +def img_save_as(img, filepath='//', file_format='JPEG', quality=90, color_mode='RGB', compression=15, view_transform = 'Raw'): '''Uses Blender 'save render' to save images - BLender isn't really able so save images with other methods correctly.''' ors = get_orig_render_settings() rs = bpy.context.scene.render + vs = bpy.context.scene.view_settings + ims = rs.image_settings ims.file_format = file_format ims.quality = quality ims.color_mode = color_mode ims.compression = compression + vs.view_transform = view_transform + img.save_render(filepath=bpy.path.abspath(filepath), scene=bpy.context.scene) diff --git a/blenderkit/upload.py b/blenderkit/upload.py index 89fa50d63..640e2085d 100644 --- a/blenderkit/upload.py +++ b/blenderkit/upload.py @@ -583,13 +583,19 @@ class FastCategory(bpy.types.Operator): # layout.template_icon_view(bkit_ratings, property, show_labels=False, scale=6.0, scale_popup=5.0) # col.prop(self, 'category') - layout.prop(self, 'category') # , expand = True) - props = bpy.context.scene.blenderkitUI - if props.asset_type == 'MODEL': # by now block this for other asset types. - # col = row.column() + layout.prop(self, 'category') + if self.category != 'NONE' and self.subcategory != 'NONE': layout.prop(self, 'subcategory') + if self.subcategory != 'NONE' and self.subcategory1 != 'NONE': layout.prop(self, 'subcategory1') - # layout.prop(self, 'subcategory', expand = True) + + # layout.prop(self, 'category') # , expand = True) + # props = bpy.context.scene.blenderkitUI + # if props.asset_type == 'MODEL': # by now block this for other asset types. + # # col = row.column() + # layout.prop(self, 'subcategory') + # layout.prop(self, 'subcategory1') + # # layout.prop(self, 'subcategory', expand = True) def execute(self, context): user_preferences = bpy.context.preferences.addons['blenderkit'].preferences -- GitLab