diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-07-23 09:23:56 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-07-23 09:30:26 +0300 |
| commit | 07f3ad06fc0900f719294c7b59598ac58e410dea (patch) | |
| tree | b27c961d095b45f2c217fe704533869d4b354224 /release/scripts/startup/bl_ui/space_toolsystem_common.py | |
| parent | 6e72d3e00e4ac5b6750f6add5e69664e65779fe5 (diff) | |
Fix T63775: Toolbar icons ignore BLENDER_SYSTEM_DATAFILES
The environment variable to locate system data-files was
ignored by toolbar icons.
Add bpy.utils.system_resource
to match Blender's internal data-file access.
Diffstat (limited to 'release/scripts/startup/bl_ui/space_toolsystem_common.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_toolsystem_common.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_common.py b/release/scripts/startup/bl_ui/space_toolsystem_common.py index e7e95c26b55..222185e18d5 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_common.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_common.py @@ -195,11 +195,8 @@ class ToolSelectPanelHelper: assert(type(icon_name) is str) icon_value = _icon_cache.get(icon_name) if icon_value is None: - dirname = bpy.utils.resource_path('LOCAL') - if not os.path.exists(dirname): - # TODO(campbell): use a better way of finding datafiles. - dirname = bpy.utils.resource_path('SYSTEM') - filename = os.path.join(dirname, "datafiles", "icons", icon_name + ".dat") + dirname = bpy.utils.system_resource('DATAFILES', "icons") + filename = os.path.join(dirname, icon_name + ".dat") try: icon_value = bpy.app.icons.new_triangles_from_file(filename) except Exception as ex: |