diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-21 01:18:23 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-21 01:18:23 +0300 |
| commit | 5340e9ac1b4f4553b0235ab5016b6cda4254ab63 (patch) | |
| tree | 2a3a5d833a5c51d6a73ada078f8cd675093dd4e9 /source/blender | |
| parent | 08c7733c1393d200513983d9b895ef8e92110591 (diff) | |
| parent | 0a968510bf65cf3418b98fb4682d601433ae0152 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender')
| -rwxr-xr-x | source/blender/datatoc/datatoc_icon_split.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/datatoc/datatoc_icon_split.py b/source/blender/datatoc/datatoc_icon_split.py index e7cc3a71446..399d7df4d8d 100755 --- a/source/blender/datatoc/datatoc_icon_split.py +++ b/source/blender/datatoc/datatoc_icon_split.py @@ -130,7 +130,7 @@ def dice_icon_name( import re # Search for eg: DEF_ICON(BRUSH_NUDGE) --> BRUSH_NUDGE - re_icon = re.compile('^\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") with open(ui_icons_h, 'r', encoding="utf-8") as f: |