Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-04-24 11:45:57 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-04-24 11:45:57 +0300
commit1da12885444c9743e474461f3d7364588d54344e (patch)
tree6d83d478438e1aac3014c4500e8975a0930404ed /release/scripts
parent45374b38808561603a7070359b3938998b1256f6 (diff)
Check LOCAL datafiles if SYSTEM not found
Diffstat (limited to 'release/scripts')
-rw-r--r--release/scripts/startup/bl_ui/space_toolsystem_common.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_common.py b/release/scripts/startup/bl_ui/space_toolsystem_common.py
index db35ab27506..2e4bbc8674b 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_common.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_common.py
@@ -62,6 +62,9 @@ class ToolSelectPanelHelper:
icon_value = _icon_cache.get(icon_name)
if icon_value is None:
dirname = bpy.utils.resource_path('SYSTEM')
+ if not dirname:
+ # TODO(campbell): use a better way of finding datafiles.
+ dirname = bpy.utils.resource_path('LOCAL')
filename = os.path.join(dirname, "datafiles", "icons", icon_name + ".dat")
try:
icon_value = bpy.app.icons.new_triangles_from_file(filename)