archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix blender_icons_update.py not working after mono icon changes.

Browse Source
This commit is contained in:
Brecht Van Lommel
2018-09-27 18:38:36 +02:00
parent 37d88fdb86
commit 99fa874c85
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/datatoc/datatoc_icon_split.py
View File

@@ -128,21 +128,26 @@ def dice_icon_name(
# Init on demand # Init on demand
if not _dice_icon_name_cache: if not _dice_icon_name_cache:
import re import re
count = 0
# Search for eg: DEF_ICON(BRUSH_NUDGE) --> BRUSH_NUDGE # Search for eg: DEF_ICON(BRUSH_NUDGE) --> BRUSH_NUDGE
re_icon = re.compile(r'^\s*DEF_ICON\(\s*([A-Za-z0-9_]+)\s*\).*$') re_icon = re.compile(r'^\s*DEF_ICON.*\(\s*([A-Za-z0-9_]+)\s*\).*$')
ui_icons_h = os.path.join(SOURCE_DIR, "source", "blender", "editors", "include", "UI_icons.h") ui_icons_h = os.path.join(SOURCE_DIR, "source", "blender", "editors", "include", "UI_icons.h")
with open(ui_icons_h, 'r', encoding="utf-8") as f: with open(ui_icons_h, 'r', encoding="utf-8") as f:
for l in f: for l in f:
match = re_icon.search(l) match = re_icon.search(l)
if match: if match:
if l.find('DEF_ICON_BLANK') == -1:
icon_name = match.group(1).lower() icon_name = match.group(1).lower()
# print(l.rstrip()) _dice_icon_name_cache[count] = icon_name
_dice_icon_name_cache[len(_dice_icon_name_cache)] = icon_name count += 1
# ---- Done with icon cache # ---- Done with icon cache
index = (y * parts_x) + x index = (y * parts_x) + x
if index not in _dice_icon_name_cache:
return None
icon_name = _dice_icon_name_cache[index] icon_name = _dice_icon_name_cache[index]
# for debugging its handy to sort by number # for debugging its handy to sort by number
@@ -209,6 +214,9 @@ def dice(
parts_x, parts_y, parts_x, parts_y,
name_style=name_style, prefix=output_prefix name_style=name_style, prefix=output_prefix
) )
if not id_str:
continue
filepath = os.path.join(output, id_str) filepath = os.path.join(output, id_str)
if VERBOSE: if VERBOSE:
print(" writing:", filepath) print(" writing:", filepath)