diff options
| -rw-r--r-- | blenderkit/categories.py | 14 | ||||
| -rw-r--r-- | blenderkit/resolutions.py | 3 | ||||
| -rw-r--r-- | blenderkit/upload.py | 6 |
3 files changed, 20 insertions, 3 deletions
diff --git a/blenderkit/categories.py b/blenderkit/categories.py index 6983d4d6..07c811d8 100644 --- a/blenderkit/categories.py +++ b/blenderkit/categories.py @@ -128,8 +128,6 @@ def get_subcategory_enums(self, context): wm = bpy.context.window_manager props = bpy.context.scene.blenderkitUI asset_type = props.asset_type.lower() -# asset_type = self.asset_type#get_upload_asset_type(self) - # asset_type = get_upload_asset_type(self) items = [] if self.category != '': asset_categories = get_category(wm['bkit_categories'], cat_path=(asset_type, self.category,)) @@ -138,6 +136,18 @@ def get_subcategory_enums(self, context): return items +def get_subcategory1_enums(self, context): + wm = bpy.context.window_manager + props = bpy.context.scene.blenderkitUI + asset_type = props.asset_type.lower() + items = [] + if self.category != '' and self.subcategory != '': + asset_categories = get_category(wm['bkit_categories'], cat_path=(asset_type, self.category, self.subcategory, )) + for c in asset_categories['children']: + items.append((c['slug'], c['name'], c['description'])) + + return items + def copy_categories(): # this creates the categories system on only tempdir = paths.get_temp_dir() diff --git a/blenderkit/resolutions.py b/blenderkit/resolutions.py index 62118d7f..89ddb6d6 100644 --- a/blenderkit/resolutions.py +++ b/blenderkit/resolutions.py @@ -359,7 +359,8 @@ def unpack_asset(data): image.filepath = fp # bpy.path.abspath(fp) image.filepath_raw = fp # bpy.path.abspath(fp) image.save() - image.unpack(method='REMOVE') + if len(image.packed_files) > 0: + image.unpack(method='REMOVE') bpy.ops.wm.save_mainfile(compress=False) # now try to delete the .blend1 file diff --git a/blenderkit/upload.py b/blenderkit/upload.py index f7d4be48..f99b4d56 100644 --- a/blenderkit/upload.py +++ b/blenderkit/upload.py @@ -501,6 +501,11 @@ class FastCategory(bpy.types.Operator): description="main category to put into", items=categories.get_subcategory_enums ) + subcategory1: EnumProperty( + name="Subcategory", + description="main category to put into", + items=categories.get_subcategory1_enums + ) asset_id: StringProperty( name="Asset Base Id", @@ -527,6 +532,7 @@ class FastCategory(bpy.types.Operator): 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): |