Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 16:34:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove asset document check

Browse source
This commit is contained in:
Jakub Trllo 2022-03-15 10:55:40 +01:00
parent 001f096f4e
commit 10333be883
2 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
openpype/tools/utils/assets_widget.py
View file

@ -513,7 +513,7 @@ class AssetModel(QtGui.QStandardItemModel):
item.setData(asset_label, ASSET_LABEL_ROLE) item.setData(asset_label, ASSET_LABEL_ROLE)
has_children = item.rowCount() > 0 has_children = item.rowCount() > 0
icon = get_asset_icon(asset_data, has_children) icon = get_asset_icon(asset_doc, has_children)
item.setData(icon, QtCore.Qt.DecorationRole) item.setData(icon, QtCore.Qt.DecorationRole)
def _threaded_fetch(self): def _threaded_fetch(self):

16
openpype/tools/utils/lib.py
View file

@ -135,11 +135,9 @@ def get_project_icon(project_doc):
def get_asset_icon_name(asset_doc, has_children=True): def get_asset_icon_name(asset_doc, has_children=True):
if asset_doc: icon_name = asset_doc["data"].get("icon")
asset_data = asset_doc.get("data") or {} if icon_name:
icon_name = asset_data.get("icon") return icon_name
if icon_name:
return icon_name
if has_children: if has_children:
return "folder" return "folder"
@ -147,11 +145,9 @@ def get_asset_icon_name(asset_doc, has_children=True):
def get_asset_icon_color(asset_doc): def get_asset_icon_color(asset_doc):
if asset_doc: icon_color = asset_doc["data"].get("color")
asset_data = asset_doc.get("data") or {} if icon_color:
icon_color = asset_data.get("color") return icon_color
if icon_color:
return icon_color
return get_default_entity_icon_color() return get_default_entity_icon_color()