blender
/
blender-addons
17
33
Fork 92
Code Issues 526 Pull Requests 31 Projects 1 Releases Wiki Activity

BlenderKit: Tooltip fixes

This commit is contained in:
Vilém Duha 2021-03-18 13:46:25 +01:00
parent 93d9e4c26b
commit ba9a1dbe27
5 changed files with 52 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
blenderkit/__init__.py
View File

@ -163,24 +163,24 @@ def check_timers_timer():
conditions = (
('UNSPECIFIED', 'Unspecified', "Don't use this in search"),
('UNSPECIFIED', 'Unspecified', ""),
('NEW', 'New', 'Shiny new item'),
('USED', 'Used', 'Casually used item'),
('OLD', 'Old', 'Old item'),
('DESOLATE', 'Desolate', 'Desolate item - dusty & rusty'),
)
model_styles = (
('REALISTIC', 'Realistic', "photo realistic model"),
('PAINTERLY', 'Painterly', 'hand painted with visible strokes, mostly for games'),
('REALISTIC', 'Realistic', "Photo realistic model"),
('PAINTERLY', 'Painterly', 'Hand painted with visible strokes'),
('LOWPOLY', 'Lowpoly', "Lowpoly art -don't mix up with polycount!"),
('ANIME', 'Anime', 'Anime style'),
('2D_VECTOR', '2D Vector', '2D vector'),
('3D_GRAPHICS', '3D Graphics', '3D graphics'),
('OTHER', 'Other', 'Other style'),
('OTHER', 'Other', 'Other styles'),
)
search_model_styles = (
('REALISTIC', 'Realistic', "photo realistic model"),
('PAINTERLY', 'Painterly', 'hand painted with visible strokes, mostly for games'),
('REALISTIC', 'Realistic', "Photo realistic model"),
('PAINTERLY', 'Painterly', 'Hand painted with visible strokes'),
('LOWPOLY', 'Lowpoly', "Lowpoly art -don't mix up with polycount!"),
('ANIME', 'Anime', 'Anime style'),
('2D_VECTOR', '2D Vector', '2D vector'),
@ -189,20 +189,20 @@ search_model_styles = (
('ANY', 'Any', 'Any Style'),
)
material_styles = (
('REALISTIC', 'Realistic', "photo realistic model"),
('NPR', 'Non photorealistic', 'hand painted with visible strokes, mostly for games'),
('REALISTIC', 'Realistic', "Photo realistic model"),
('NPR', 'Non photorealistic', 'Hand painted with visible strokes'),
('OTHER', 'Other', 'Other style'),
)
search_material_styles = (
('REALISTIC', 'Realistic', "photo realistic model"),
('NPR', 'Non photorealistic', 'hand painted with visible strokes, mostly for games'),
('REALISTIC', 'Realistic', "Photo realistic model"),
('NPR', 'Non photorealistic', 'Hand painted with visible strokes'),
('ANY', 'Any', 'Any'),
)
engines = (
('CYCLES', 'Cycles', 'blender cycles pathtracer'),
('EEVEE', 'Eevee', 'blender eevee renderer'),
('OCTANE', 'Octane', 'octane render enginge'),
('ARNOLD', 'Arnold', 'arnold render engine'),
('CYCLES', 'Cycles', 'Blender Cycles'),
('EEVEE', 'Eevee', 'Blender eevee renderer'),
('OCTANE', 'Octane', 'Octane render enginge'),
('ARNOLD', 'Arnold', 'Arnold render engine'),
('V-RAY', 'V-Ray', 'V-Ray renderer'),
('UNREAL', 'Unreal', 'Unreal engine'),
('UNITY', 'Unity', 'Unity engine'),
@ -297,22 +297,22 @@ def asset_type_callback(self, context):
if self.down_up == 'SEARCH':
items = (
('MODEL', 'Models', 'Find models in the BlenderKit online database', 'OBJECT_DATAMODE', 0),
('MATERIAL', 'Materials', 'Find materials in the BlenderKit online database', 'MATERIAL', 2),
('MODEL', 'Models', 'Find models', 'OBJECT_DATAMODE', 0),
('MATERIAL', 'Materials', 'Find materials', 'MATERIAL', 2),
# ('TEXTURE', 'Texture', 'Browse textures', 'TEXTURE', 3),
('SCENE', 'Scenes', 'Browse scenes', 'SCENE_DATA', 3),
('HDR', 'HDRs', 'Browse HDRs', 'WORLD', 4),
('BRUSH', 'Brushes', 'Find brushes in the BlenderKit online database', 'BRUSH_DATA', 5)
('SCENE', 'Scenes', 'Find scenes', 'SCENE_DATA', 3),
('HDR', 'HDRs', 'Find HDRs', 'WORLD', 4),
('BRUSH', 'Brushes', 'Find brushes', 'BRUSH_DATA', 5)
)
else:
items = (
('MODEL', 'Model', 'Upload a model to BlenderKit', 'OBJECT_DATAMODE', 0),
('MODEL', 'Model', 'Upload a model', 'OBJECT_DATAMODE', 0),
# ('SCENE', 'SCENE', 'Browse scenes', 'SCENE_DATA', 1),
('MATERIAL', 'Material', 'Upload a material to BlenderKit', 'MATERIAL', 2),
('MATERIAL', 'Material', 'Upload a material', 'MATERIAL', 2),
# ('TEXTURE', 'Texture', 'Browse textures', 'TEXTURE', 3),
('SCENE', 'Scene', 'Browse scenes', 'SCENE_DATA', 3),
('HDR', 'HDR', 'Browse HDRs', 'WORLD', 4),
('BRUSH', 'Brush', 'Upload a brush to BlenderKit', 'BRUSH_DATA', 5)
('SCENE', 'Scene', 'Upload a scene', 'SCENE_DATA', 3),
('HDR', 'HDR', 'Upload a HDR', 'WORLD', 4),
('BRUSH', 'Brush', 'Upload a brush', 'BRUSH_DATA', 5)
)
return items
@ -322,11 +322,11 @@ class BlenderKitUIProps(PropertyGroup):
down_up: EnumProperty(
name="Download vs Upload",
items=(
('SEARCH', 'Search', 'Sctivate searching', 'VIEWZOOM', 0),
('SEARCH', 'Search', 'Activate searching', 'VIEWZOOM', 0),
('UPLOAD', 'Upload', 'Activate uploading', 'COPYDOWN', 1),
# ('RATING', 'Rating', 'Activate rating', 'SOLO_ON', 2)
),
description="BLenderKit",
description="BlenderKit",
default="SEARCH",
update=udate_down_up
)
@ -470,7 +470,7 @@ class BlenderKitCommonSearchProps(object):
# TEXTURE RESOLUTION
search_texture_resolution: BoolProperty(name="Texture Resolution",
description="Span of the texture resolutions",
description="Limit texture resolutions",
default=False,
update=search.search_update,
)
@ -492,7 +492,7 @@ class BlenderKitCommonSearchProps(object):
# file_size
search_file_size: BoolProperty(name="File Size",
description="Span of the file sizes",
description="Limit file sizes",
default=False,
update=search.search_update,
)
@ -626,7 +626,7 @@ class BlenderKitCommonUploadProps(object):
pbr: BoolProperty(name="Pure PBR Compatible",
description="Is compatible with PBR standard. This means only image textures are used with no"
" procedurals and no color correction, only pbr shader is used",
" procedurals and no color correction, only principled shader is used",
default=False)
pbr_type: EnumProperty(
@ -650,7 +650,7 @@ class BlenderKitCommonUploadProps(object):
description="Public assets go into the validation process. \n"
"Validated assets are visible to all users.\n"
"Private assets are limited by your plan quota\n"
"Current status:",
"State",
default="PUBLIC",
)
@ -860,22 +860,24 @@ class BlenderKitMaterialUploadProps(PropertyGroup, BlenderKitCommonUploadProps):
texture_resolution_max: IntProperty(name="Texture Resolution Max", description="texture resolution maximum",
default=0)
texture_size_meters: FloatProperty(name="Texture Size in Meters", description="face count, autofilled",
texture_size_meters: FloatProperty(name="Texture Size in Meters", description="Size of texture in real world units.",
default=1.0, min=0)
thumbnail_scale: FloatProperty(name="Thumbnail Object Size",
description="size of material preview object in meters "
"- change for materials that look better at sizes different than 1m",
description="Size of material preview object in meters."
"Change for materials that look better at sizes different than 1m",
default=1, min=0.00001, max=10)
thumbnail_background: BoolProperty(name="Thumbnail Background (for Glass only)",
description="For refractive materials, you might need a background. "
"Don't use if thumbnail looks good without it!",
description="For refractive materials, you might need a background.\n"
"Don't use for other types of materials.\n"
"Transparent background is preferred",
default=False)
thumbnail_background_lightness: FloatProperty(name="Thumbnail Background Lightness",
description="set to make your material stand out", default=.9,
description="Set to make your material stand out with enough contrast",
default=.9,
min=0.00001, max=1)
thumbnail_samples: IntProperty(name="Cycles Samples",
description="cycles samples setting", default=100,
description="Cycles samples", default=100,
min=5, max=5000)
thumbnail_denoising: BoolProperty(name="Use Denoising",
description="Use denoising", default=True)
@ -991,9 +993,9 @@ class BlenderKitModelUploadProps(PropertyGroup, BlenderKitCommonUploadProps):
('TEMPLATE', 'Template', 'Asset intended to help in creation of something else'),
),
default='FINISHED',
description='Production state of the asset, \n also template should be actually finished, \n'
'just the nature of it can be a template, like a thumbnailer scene, \n '
'finished mesh topology as start for modelling or similar',
description='Production state of the asset. \n'
'Templates should be tools to finish certain tasks, like a thumbnailer scene, \n '
'finished mesh topology as start for modelling or others',
)
engine_other: StringProperty(
@ -1374,7 +1376,8 @@ class BlenderKitModelSearchProps(PropertyGroup, BlenderKitCommonSearchProps):
# DESIGN YEAR
search_design_year: BoolProperty(name="Sesigned in Year",
description="When the object was approximately designed",
description="When the object was approximately designed. \n"
"Useful for search of historical or future objects",
default=False,
update=search.search_update,
)
@ -1395,19 +1398,19 @@ class BlenderKitModelSearchProps(PropertyGroup, BlenderKitCommonSearchProps):
# POLYCOUNT
search_polycount: BoolProperty(name="Use Polycount",
description="Use polycount of object search tag",
description="Limit polycount",
default=False,
update=search.search_update, )
search_polycount_min: IntProperty(name="Min Polycount",
description="Minimum poly count of the asset",
description="Minimum poly count",
default=0,
min=0,
max=100000000,
update=search.search_update, )
search_polycount_max: IntProperty(name="Max Polycount",
description="Maximum poly count of the asset",
description="Maximum poly count",
default=100000000,
min=0,
max=100000000,
@ -1496,7 +1499,7 @@ class BlenderKitSceneSearchProps(PropertyGroup, BlenderKitCommonSearchProps):
search_style: EnumProperty(
name="Style",
items=search_model_styles,
description="keywords defining style (realistic, painted, polygonal, other)",
description="Restrict search for style",
default="ANY",
update=search.search_update
)

2
blenderkit/asset_bar_op.py
View File

@ -175,7 +175,7 @@ class BlenderKitAssetBarOperator(BL_UI_OT_draw_operator):
description="search only subtree of this category",
default="", options={'SKIP_SAVE'})
tooltip: bpy.props.StringProperty(default='runs search and displays the asset bar at the same time')
tooltip: bpy.props.StringProperty(default='Runs search and displays the asset bar at the same time')
@classmethod
def description(cls, context, properties):

2
blenderkit/autothumb.py
View File

@ -272,7 +272,7 @@ class GenerateThumbnailOperator(bpy.types.Operator):
class GenerateMaterialThumbnailOperator(bpy.types.Operator):
"""Tooltip"""
"""Generate default thumbnail with Cycles renderer."""
bl_idname = "object.blenderkit_material_thumbnail"
bl_label = "BlenderKit Material Thumbnail Generator"
bl_options = {'REGISTER', 'INTERNAL'}

2
blenderkit/search.py
View File

@ -108,7 +108,7 @@ def update_ad(ad):
ad['author']['id'] = ad['author_id'] # this should stay ONLY for compatibility with older scenes
ad['canDownload'] = ad['can_download'] # this should stay ONLY for compatibility with older scenes
except Exception as e:
bk_logger.error('BLenderKit failed to update older asset data')
bk_logger.error('BlenderKit failed to update older asset data')
return ad

1
blenderkit/ui_panels.py
View File

@ -1613,6 +1613,7 @@ def draw_panel_categories(self, context):
op = row.operator('view3d.blenderkit_asset_bar', text=ctext)
op.do_search = True
op.keep_running = True
op.tooltip = f"Browse {c['name']} category"
op.category = c['slug']
if len(c['children']) > 0 and c['assetCount'] > 15 or (
utils.profile_is_validator() and user_preferences.categories_fix):