diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-13 13:36:24 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-13 13:36:24 +0300 |
| commit | 224edde807d76dcccfdb2b204cfa1739d544eca0 (patch) | |
| tree | 034b5e1afecc9473d2932010b88bc8c642f9fe59 /release | |
| parent | af2d39d902c0e302a32b979a8d47ff8e067c0d65 (diff) | |
| parent | 617c4d6adbfe64b3a72b5c48f918f39d30aa18dc (diff) | |
Merge branch 'master' into custom-normals-bmeshcustom-normals-bmesh
Diffstat (limited to 'release')
| -rw-r--r-- | release/datafiles/LICENSE-droidsans.ttf.txt | 2 | ||||
| -rw-r--r-- | release/datafiles/fonts/droidsans.ttf.gz | bin | 2485497 -> 2485539 bytes | |||
| -rw-r--r-- | release/scripts/modules/bpy/utils/previews.py | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/release/datafiles/LICENSE-droidsans.ttf.txt b/release/datafiles/LICENSE-droidsans.ttf.txt index cf6f53e8644..6711ad37338 100644 --- a/release/datafiles/LICENSE-droidsans.ttf.txt +++ b/release/datafiles/LICENSE-droidsans.ttf.txt @@ -52,6 +52,8 @@ License: GPL-2.1+ (8) tlwg Loma (Thaï) Copyright: 2003 National Electronics and Computer Technology Center +Modified to fix and/or adapt kerning to Blender basic layout engine by Hồ Châu in 2016. + License: GPL-2+ with Font exception See Appendices C. diff --git a/release/datafiles/fonts/droidsans.ttf.gz b/release/datafiles/fonts/droidsans.ttf.gz Binary files differindex 5b942162141..7940852f637 100644 --- a/release/datafiles/fonts/droidsans.ttf.gz +++ b/release/datafiles/fonts/droidsans.ttf.gz diff --git a/release/scripts/modules/bpy/utils/previews.py b/release/scripts/modules/bpy/utils/previews.py index c67c523ea72..568116b027c 100644 --- a/release/scripts/modules/bpy/utils/previews.py +++ b/release/scripts/modules/bpy/utils/previews.py @@ -30,7 +30,7 @@ This allows scripts to generate their own previews, and use them as icons in UI Custom Icon Example ------------------- -.. literalinclude:: ../../../release/scripts/templates_py/ui_previews_custom_icon.py +.. literalinclude:: __/__/__/release/scripts/templates_py/ui_previews_custom_icon.py """ __all__ = ( |