|
No longer embed fonts in the Blender executable, but store them in the font folder along with the international fonts.
This is to avoid a potential issue between the font and GPL licenses. It is not clear if there is really a problem, but to avoid wasting time on discussions this commit makes the change.
See here:
http://lists.blender.org/pipermail/bf-committers/2013-September/041754.html
This turns out to be quite a big patch. I have only tested it on OS X so far, testing is needed on Linux and Windows still. Especially things to test are:
* saving game engine runtimes (add text object in scene and save, see if it still there when running the game player)
* translation and international fonts
* text editor monospace font
* 3D text object editing
Total comments: 1
Total comments: 1
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+223 lines, -190 lines) |
Patch |
|
M |
SConstruct
|
View
|
|
2 chunks |
+23 lines, -26 lines |
0 comments
|
Download
|
|
M |
build_files/scons/tools/Blender.py
|
View
|
|
1 chunk |
+3 lines, -2 lines |
0 comments
|
Download
|
|
M |
source/blender/blenfont/BLF_api.h
|
View
|
|
1 chunk |
+4 lines, -2 lines |
0 comments
|
Download
|
|
M |
source/blender/blenfont/BLF_translation.h
|
View
|
|
1 chunk |
+0 lines, -5 lines |
0 comments
|
Download
|
|
M |
source/blender/blenfont/intern/blf.c
|
View
|
|
7 chunks |
+39 lines, -11 lines |
0 comments
|
Download
|
|
M |
source/blender/blenfont/intern/blf_dir.c
|
View
|
|
1 chunk |
+11 lines, -0 lines |
0 comments
|
Download
|
|
M |
source/blender/blenfont/intern/blf_font.c
|
View
|
|
3 chunks |
+31 lines, -2 lines |
1 comment
|
Download
|
|
M |
source/blender/blenfont/intern/blf_internal.h
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
|
M |
source/blender/blenfont/intern/blf_internal_types.h
|
View
|
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
|
M |
source/blender/blenfont/intern/blf_translation.c
|
View
|
|
1 chunk |
+0 lines, -76 lines |
0 comments
|
Download
|
|
M |
source/blender/blenkernel/BKE_font.h
|
View
|
|
1 chunk |
+2 lines, -1 line |
0 comments
|
Download
|
|
M |
source/blender/blenkernel/intern/font.c
|
View
|
|
1 chunk |
+19 lines, -3 lines |
0 comments
|
Download
|
|
M |
source/blender/blenlib/BLI_fileops.h
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
|
M |
source/blender/blenlib/intern/fileops.c
|
View
|
1
|
1 chunk |
+45 lines, -0 lines |
0 comments
|
Download
|
|
M |
source/blender/editors/datafiles/CMakeLists.txt
|
View
|
|
1 chunk |
+0 lines, -6 lines |
0 comments
|
Download
|
|
M |
source/blender/editors/datafiles/SConscript
|
View
|
|
1 chunk |
+0 lines, -4 lines |
0 comments
|
Download
|
|
M |
source/blender/editors/include/ED_datafiles.h
|
View
|
|
1 chunk |
+0 lines, -9 lines |
0 comments
|
Download
|
|
M |
source/blender/editors/interface/interface_style.c
|
View
|
|
4 chunks |
+16 lines, -31 lines |
0 comments
|
Download
|
|
M |
source/blender/python/generic/blf_py_api.c
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
source/blender/windowmanager/intern/wm_init_exit.c
|
View
|
|
1 chunk |
+1 line, -2 lines |
0 comments
|
Download
|
|
M |
source/blender/windowmanager/intern/wm_playanim.c
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
source/creator/CMakeLists.txt
|
View
|
|
2 chunks |
+19 lines, -0 lines |
0 comments
|
Download
|
|
M |
source/creator/creator.c
|
View
|
|
1 chunk |
+1 line, -2 lines |
0 comments
|
Download
|
|
M |
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
|
View
|
|
3 chunks |
+1 line, -5 lines |
0 comments
|
Download
|
|
M |
source/gameengine/Ketsji/KX_FontObject.cpp
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
Total messages: 8
|