[Bf-extensions-cvs] [515d85d3] master: BlenderKit: fast changing of categories for assets
Vilém Duha
noreply at git.blender.org
Sat Dec 5 23:34:44 CET 2020
Commit: 515d85d3faf2f88bbb7abee1d0b2d6d0fde0ba91
Author: Vilém Duha
Date: Sat Dec 5 23:34:35 2020 +0100
Branches: master
https://developer.blender.org/rBA515d85d3faf2f88bbb7abee1d0b2d6d0fde0ba91
BlenderKit: fast changing of categories for assets
this tool will probably evolve in fast metadata editing, for now it should help to fix category system.
===================================================================
M blenderkit/__init__.py
M blenderkit/categories.py
M blenderkit/ui.py
M blenderkit/ui_panels.py
M blenderkit/upload.py
M blenderkit/utils.py
===================================================================
diff --git a/blenderkit/__init__.py b/blenderkit/__init__.py
index 3726a3c2..d38f185b 100644
--- a/blenderkit/__init__.py
+++ b/blenderkit/__init__.py
@@ -199,37 +199,7 @@ thumbnail_resolutions = (
)
-def get_upload_asset_type(self):
- typemapper = {
- BlenderKitModelUploadProps: 'model',
- BlenderKitSceneUploadProps: 'scene',
- BlenderKitMaterialUploadProps: 'material',
- BlenderKitBrushUploadProps: 'brush'
- }
- asset_type = typemapper[type(self)]
- return asset_type
-
-
-def get_subcategory_enums(self, context):
- wm = bpy.context.window_manager
- asset_type = get_upload_asset_type(self)
- items = []
- if self.category != '':
- asset_categories = categories.get_category(wm['bkit_categories'], cat_path=(asset_type, self.category,))
- for c in asset_categories['children']:
- items.append((c['slug'], c['name'], c['description']))
- return items
-
-
-def get_category_enums(self, context):
- wm = bpy.context.window_manager
- asset_type = get_upload_asset_type(self)
- asset_categories = categories.get_category(wm['bkit_categories'], cat_path=(asset_type,))
- items = []
- for c in asset_categories['children']:
- items.append((c['slug'], c['name'], c['description']))
- return items
def switch_search_results(self, context):
@@ -278,6 +248,8 @@ def asset_type_callback(self, context):
return items
+
+
class BlenderKitUIProps(PropertyGroup):
down_up: EnumProperty(
name="Download vs Upload",
@@ -490,7 +462,7 @@ class BlenderKitCommonSearchProps(object):
update=search.search_update,
)
- #resolution download/import settings
+ # resolution download/import settings
resolution: EnumProperty(
name="Max resolution",
description="Cap texture sizes in the file to this resolution",
@@ -509,9 +481,9 @@ class BlenderKitCommonSearchProps(object):
)
unpack_files: BoolProperty(name="Unpack Files",
- description="Unpack files after download",
- default=True
- )
+ description="Unpack files after download",
+ default=True
+ )
def name_update(self, context):
@@ -667,12 +639,12 @@ class BlenderKitCommonUploadProps(object):
category: EnumProperty(
name="Category",
description="main category to put into",
- items=get_category_enums
+ items=categories.get_category_enums
)
subcategory: EnumProperty(
name="Subcategory",
description="main category to put into",
- items=get_subcategory_enums
+ items=categories.get_subcategory_enums
)
diff --git a/blenderkit/categories.py b/blenderkit/categories.py
index 8983e3ad..6983d4d6 100644
--- a/blenderkit/categories.py
+++ b/blenderkit/categories.py
@@ -65,6 +65,32 @@ def filter_categories(categories):
filter_category(category)
+def get_category_path(categories, category):
+ '''finds the category in all possible subcategories and returns the path to it'''
+ category_path = []
+ check_categories = categories[:]
+ parents = {}
+ while len(check_categories) > 0:
+ ccheck = check_categories.pop()
+ # print(ccheck['name'])
+ if not ccheck.get('children'):
+ continue
+
+ for ch in ccheck['children']:
+ # print(ch['name'])
+ parents[ch['slug']] = ccheck['slug']
+
+ if ch['slug'] == category:
+ category_path = [ch['slug']]
+ slug = ch['slug']
+ while parents.get(slug):
+ slug = parents.get(slug)
+
+ category_path.insert(0, slug)
+ return category_path
+ check_categories.append(ch)
+
+
def get_category(categories, cat_path=()):
for category in cat_path:
for c in categories:
@@ -74,6 +100,43 @@ def get_category(categories, cat_path=()):
return (c)
break;
+def get_upload_asset_type(self):
+ typemapper = {
+ bpy.types.Object.blenderkit: 'model',
+ bpy.types.Scene.blenderkit: 'scene',
+ bpy.types.Material.blenderkit: 'material',
+ bpy.types.Brush.blenderkit: 'brush'
+ }
+ asset_type = typemapper[type(self)]
+ return asset_type
+
+
+
+
+def get_category_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_categories = get_category(wm['bkit_categories'], cat_path=(asset_type,))
+ items = []
+ for c in asset_categories['children']:
+ items.append((c['slug'], c['name'], c['description']))
+ return items
+
+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,))
+ 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
diff --git a/blenderkit/ui.py b/blenderkit/ui.py
index 38aa46ac..71e4b06f 100644
--- a/blenderkit/ui.py
+++ b/blenderkit/ui.py
@@ -30,8 +30,9 @@ if "bpy" in locals():
bg_blender = importlib.reload(bg_blender)
colors = importlib.reload(colors)
tasks_queue = importlib.reload(tasks_queue)
+ tasks_queue = importlib.reload(ui_panels)
else:
- from blenderkit import paths, ratings, utils, search, upload, ui_bgl, download, bg_blender, colors, tasks_queue
+ from blenderkit import paths, ratings, utils, search, upload, ui_bgl, download, bg_blender, colors, tasks_queue, ui_panels
import bpy
@@ -1920,6 +1921,7 @@ def register_ui():
wm = bpy.context.window_manager
km = wm.keyconfigs.addon.keymaps['Window']
kmi = km.keymap_items.new(ratings.FastRateMenu.bl_idname, 'F', 'PRESS', ctrl=False, shift=False)
+ kmi = km.keymap_items.new(upload.FastCategory.bl_idname, 'F', 'PRESS', ctrl=True, shift=False)
addon_keymapitems.append(kmi)
diff --git a/blenderkit/ui_panels.py b/blenderkit/ui_panels.py
index a1f990cb..b7c9884c 100644
--- a/blenderkit/ui_panels.py
+++ b/blenderkit/ui_panels.py
@@ -46,6 +46,7 @@ from bpy.props import (
import bpy
import os
import random
+import blenderkit
# this was moved to separate interface:
@@ -415,7 +416,7 @@ class NODE_PT_blenderkit_material_properties(Panel):
draw_panel_material_ratings(self, context)
layout.label(text='Asset tools:')
- draw_asset_context_menu(self, context, ad, from_panel = True)
+ draw_asset_context_menu(self, context, ad, from_panel=True)
# if 'rig' in ad['tags']:
# # layout.label(text = 'can make proxy')
# layout.operator('object.blenderkit_make_proxy', text = 'Make Armature proxy')
@@ -1147,7 +1148,6 @@ def draw_asset_context_menu(self, context, asset_data, from_panel=False):
if from_panel:
# Called from addon panel
-
if asset_data.get('resolution'):
op = col.operator('scene.blenderkit_download', text='Replace asset resolution')
op.asset_base_id = asset_data['assetBaseId']
@@ -1162,7 +1162,7 @@ def draw_asset_context_menu(self, context, asset_data, from_panel=False):
op.model_location = aob.location
op.model_rotation = aob.rotation_euler
op.target_object = aob.name
- op.material_target_slot = aob.active_material_index
+ op.material_target_slot = aob.active_material_index
op.replace_resolution = True
op.invoke_resolution = True
op.max_resolution = asset_data.get('max_resolution',
@@ -1182,8 +1182,8 @@ def draw_asset_context_menu(self, context, asset_data, from_panel=False):
op.model_location = o.location
op.model_rotation = o.rotation_euler
else:
- op.model_location = (0,0,0)
- op.model_rotation = (0,0,0)
+ op.model_location = (0, 0, 0)
+ op.model_rotation = (0, 0, 0)
op.max_resolution = asset_data.get('max_resolution',
0) # str(utils.get_param(asset_data, 'textureResolutionMax'))
@@ -1235,6 +1235,9 @@ def draw_asset_context_menu(self, context, asset_data, from_panel=False):
op.asset_id = asset_data['id']
+
+
+
# def draw_asset_resolution_replace(self, context, resolution):
# layout = self.layout
# ui_props = bpy.context.scene.blenderkitUI
@@ -1286,7 +1289,7 @@ class OBJECT_MT_blenderkit_asset_menu(bpy.types.Menu):
# sr = bpy.context.scene['search results']
sr = bpy.context.scene['search results']
asset_data = sr[ui_props.active_index]
- draw_asset_context_menu(self, context, asset_data, from_panel = False)
+ draw_asset_context_menu(self, context, asset_data, from_panel=False)
class OBJECT_MT_blenderkit_login_menu(bpy.types.Menu):
diff --git a/blenderkit/upload.py b/blenderkit/upload.py
index c789313d..f7d4be48 100644
--- a/blenderkit/upload.py
+++ b/blenderkit/upload.py
@@ -32,9 +32,10 @@ if "bpy" in locals():
overrides = reload(overrides)
colors = reload(colors)
rerequests = reload(rerequests)
+ categories = reload(categories)
else:
from blenderkit import asset_inspector, paths, utils, bg_blender, autothumb, version_checker, search, ui_panels, ui, \
- overrides
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list