From b04f9adb40c1c323b35798dbeeba4e5b8d50912c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Wed, 20 Jul 2016 16:02:56 +0200 Subject: [PATCH] Texture browser: Don't use file name as menu item label. Just using the node name is clearer, as it only depends on the node, and no longer on the linked files themselves. This also makes it easier to get compatible with HDRi nodes (as those files won't be named "{name}-{maptype}". --- blender_cloud/texture_browser.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/blender_cloud/texture_browser.py b/blender_cloud/texture_browser.py index 4f726bb..b1d9015 100644 --- a/blender_cloud/texture_browser.py +++ b/blender_cloud/texture_browser.py @@ -135,7 +135,7 @@ class MenuItem: def node_uuid(self) -> str: return self.node['_id'] - def update(self, node, file_desc, thumb_path: str, label_text): + def update(self, node, file_desc, thumb_path: str, label_text=None): # We can get updated information about our Node, but a MenuItem should # always represent one node, and it shouldn't be shared between nodes. if self.node_uuid != node['_id']: @@ -144,7 +144,9 @@ class MenuItem: self.node = node self.file_desc = file_desc # pillarsdk.File object, or None if a 'folder' node. self.thumb_path = thumb_path - self.label_text = label_text + + if label_text is not None: + self.label_text = label_text @property def is_folder(self) -> bool: @@ -471,7 +473,7 @@ class BlenderCloudBrowser(pillar.PillarOperatorMixin, self.add_menu_item(node, None, 'SPINNER', texture_node['name']) def thumbnail_loaded(node, file_desc, thumb_path): - self.update_menu_item(node, file_desc, thumb_path, file_desc['filename']) + self.update_menu_item(node, file_desc, thumb_path) project_uuid = self.current_path.project_uuid node_uuid = self.current_path.node_uuid