Blender Git Loki

Git Commits -> Revision 405cf80

Revision 405cf80 by Diego Borghetti (master)
May 5, 2009, 23:10 (GMT)
Big, big commit!!

1) Remove WITH_FREETYPE2 from code, so now blender always need freetype2
2) Remove the old bmfont
3) Remove ftfont and bFTGL library
4) Implement a new BLF_draw_default function for place that still need/use
the old BMF api.

I try to update both, scons and cmake, but I only can test with make, so
hope all work fine.

MSVC is broken, but I don't have Windows, things to search and fix are
any reference to WITH_FREETYPE2, FTGL and BMFONT (take in care that
blenkernel also have a BKE_bmfont.h, this don't have anything to do with bmfont).
Always have to link/include the freetype2 library
Remove any reference to libbmfont
Remove any reference to libftfont
Remove any reference to libbftgl (or libbFTGL)

Commit Details:

Full Hash: 405cf80eb8dc2df8ae160aee70aef34052add24a
SVN Revision: 20073
Parent Commit: 71c3897
Lines Changed: +330, -20597

107 Deleted Paths:

/extern/bFTGL/cleanup (+0, -4)
/extern/bFTGL/CMakeLists.txt (+0, -32)
/extern/bFTGL/COPYING.txt (+0, -481)
/extern/bFTGL/include/FTBBox.h (+0, -124)
/extern/bFTGL/include/FTBitmapGlyph.h (+0, -76)
/extern/bFTGL/include/FTBufferGlyph.h (+0, -76)
/extern/bFTGL/include/FTCharmap.h (+0, -136)
/extern/bFTGL/include/FTCharToGlyphIndexMap.h (+0, -130)
/extern/bFTGL/include/FTContour.h (+0, -88)
/extern/bFTGL/include/FTExtrdGlyph.h (+0, -71)
/extern/bFTGL/include/FTFace.h (+0, -149)
/extern/bFTGL/include/FTFont.h (+0, -260)
/extern/bFTGL/include/FTGL.h (+0, -100)
/extern/bFTGL/include/FTGLBitmapFont.h (+0, -65)
/extern/bFTGL/include/FTGLBufferFont.h (+0, -76)
/extern/bFTGL/include/FTGLExtrdFont.h (+0, -55)
/extern/bFTGL/include/FTGLOutlineFont.h (+0, -64)
/extern/bFTGL/include/FTGLPixmapFont.h (+0, -68)
/extern/bFTGL/include/FTGLPolygonFont.h (+0, -53)
/extern/bFTGL/include/FTGLTextureFont.h (+0, -151)
/extern/bFTGL/include/FTGlyph.h (+0, -89)
/extern/bFTGL/include/FTGlyphContainer.h (+0, -127)
/extern/bFTGL/include/FTLibrary.h (+0, -97)
/extern/bFTGL/include/FTList.h (+0, -112)
/extern/bFTGL/include/FTOutlineGlyph.h (+0, -54)
/extern/bFTGL/include/FTPixmapGlyph.h (+0, -68)
/extern/bFTGL/include/FTPoint.h (+0, -85)
/extern/bFTGL/include/FTPolyGlyph.h (+0, -55)
/extern/bFTGL/include/FTSize.h (+0, -132)
/extern/bFTGL/include/FTTextureGlyph.h (+0, -89)
/extern/bFTGL/include/FTVector.h (+0, -190)
/extern/bFTGL/include/FTVectoriser.h (+0, -275)
/extern/bFTGL/license.txt (+0, -27)
/extern/bFTGL/make/msvc_7_0/ftgl_static_lib.vcproj (+0, -406)
/extern/bFTGL/make/msvc_9_0/ftgl_static_lib.vcproj (+0, -537)
/extern/bFTGL/README.txt (+0, -51)
/extern/bFTGL/SConscript (+0, -12)
/extern/bFTGL/src/FTBitmapGlyph.cpp (+0, -66)
/extern/bFTGL/src/FTBufferGlyph.cpp (+0, -59)
/extern/bFTGL/src/FTCharmap.cpp (+0, -62)
/extern/bFTGL/src/FTContour.cpp (+0, -149)
/extern/bFTGL/src/FTExtrdGlyph.cpp (+0, -141)
/extern/bFTGL/src/FTFace.cpp (+0, -154)
/extern/bFTGL/src/FTFont.cpp (+0, -271)
/extern/bFTGL/src/FTGLBitmapFont.cpp (+0, -66)
/extern/bFTGL/src/FTGLBufferFont.cpp (+0, -53)
/extern/bFTGL/src/FTGLExtrdFont.cpp (+0, -35)
/extern/bFTGL/src/FTGLOutlineFont.cpp (+0, -66)
/extern/bFTGL/src/FTGLPixmapFont.cpp (+0, -68)
/extern/bFTGL/src/FTGLPolygonFont.cpp (+0, -33)
/extern/bFTGL/src/FTGLTextureFont.cpp (+0, -178)
/extern/bFTGL/src/FTGlyph.cpp (+0, -17)
/extern/bFTGL/src/FTGlyphContainer.cpp (+0, -93)
/extern/bFTGL/src/FTLibrary.cpp (+0, -64)
/extern/bFTGL/src/FTOutlineGlyph.cpp (+0, -57)
/extern/bFTGL/src/FTPixmapGlyph.cpp (+0, -109)
/extern/bFTGL/src/FTPoint.cpp (+0, -14)
/extern/bFTGL/src/FTPolyGlyph.cpp (+0, -62)
/extern/bFTGL/src/FTSize.cpp (+0, -105)
/extern/bFTGL/src/FTTextureGlyph.cpp (+0, -87)
/extern/bFTGL/src/FTVectoriser.cpp (+0, -229)
/extern/bFTGL/src/Makefile (+0, -60)
/extern/bFTGL/win32_vcpp/ftgl.dsw (+0, -92)
/extern/bFTGL/win32_vcpp/ftgl_dll/ftgl_dll.dsp (+0, -357)
/extern/bFTGL/win32_vcpp/ftgl_static_lib/ftgl_static_lib.dsp (+0, -342)
/extern/bFTGL/win32_vcpp/README_WIN32.txt (+0, -206)
/extern/bFTGL/win32_vcpp/unit_tests/unit_tests.dsp (+0, -168)
/intern/bmfont/BMF_Api.h (+0, -162)
/intern/bmfont/BMF_Fonts.h (+0, -74)
/intern/bmfont/BMF_Settings.h (+0, -67)
/intern/bmfont/CMakeLists.txt (+0, -32)
/intern/bmfont/intern/BDF2BMF.py (+0, -177)
/intern/bmfont/intern/BMF_Api.cpp (+0, -183)
/intern/bmfont/intern/BMF_BitmapFont.cpp (+0, -323)
/intern/bmfont/intern/BMF_BitmapFont.h (+0, -140)
/intern/bmfont/intern/BMF_FontData.h (+0, -55)
/intern/bmfont/intern/BMF_font_helv10.cpp (+0, -494)
/intern/bmfont/intern/BMF_font_helv12.cpp (+0, -525)
/intern/bmfont/intern/BMF_font_helvb10.cpp (+0, -492)
/intern/bmfont/intern/BMF_font_helvb12.cpp (+0, -565)
/intern/bmfont/intern/BMF_font_helvb14.cpp (+0, -623)
/intern/bmfont/intern/BMF_font_helvb8.cpp (+0, -455)
/intern/bmfont/intern/BMF_font_scr12.cpp (+0, -484)
/intern/bmfont/intern/BMF_font_scr14.cpp (+0, -510)
/intern/bmfont/intern/BMF_font_scr15.cpp (+0, -525)
/intern/bmfont/intern/Makefile (+0, -41)
/intern/bmfont/make/msvc_6_0/bmfont.dsp (+0, -176)
/intern/bmfont/make/msvc_6_0/bmfont.dsw (+0, -29)
/intern/bmfont/make/msvc_7_0/bmfont.sln (+0, -21)
/intern/bmfont/make/msvc_7_0/bmfont.vcproj (+0, -314)
/intern/bmfont/make/msvc_9_0/bmfont.vcproj (+0, -413)
/intern/bmfont/Makefile (+0, -52)
/intern/bmfont/SConscript (+0, -10)
/intern/bmfont/test/make/msvc_6_0/BMF_Test.dsp (+0, -109)
/intern/bmfont/test/make/msvc_6_0/BMF_Test.dsw (+0, -44)
/intern/bmfont/test/Makefile (+0, -60)
/intern/bmfont/test/simpletest/BMF_Test.cpp (+0, -226)
/intern/bmfont/test/simpletest/Makefile (+0, -42)
/source/blender/blenfont/intern/blf_font_helv10.h (+0, -487)
/source/blender/blenfont/intern/blf_font_helv12.h (+0, -519)
/source/blender/blenfont/intern/blf_font_helvb10.h (+0, -487)
/source/blender/blenfont/intern/blf_font_helvb12.h (+0, -559)
/source/blender/blenfont/intern/blf_font_helvb8.h (+0, -449)
/source/blender/blenfont/intern/blf_font_scr12.h (+0, -479)
/source/blender/blenfont/intern/blf_font_scr14.h (+0, -504)
/source/blender/blenfont/intern/blf_font_scr15.h (+0, -519)
/source/blender/blenfont/intern/blf_internal.c (+0, -435)

126 Modified Paths:

/blenderplayer/CMakeLists.txt (+0, -3) (Diff)
/CMake/macros.cmake (+2, -2) (Diff)
/CMakeLists.txt (+0, -4) (Diff)
/config/darwin-config.py (+0, -5) (Diff)
/config/irix6-config.py (+0, -5) (Diff)
/config/linux2-config.py (+0, -5) (Diff)
/config/linuxcross-config.py (+0, -5) (Diff)
/config/openbsd3-config.py (+0, -5) (Diff)
/config/sunos5-config.py (+0, -5) (Diff)
/config/win32-mingw-config.py (+0, -5) (Diff)
/config/win32-vc-config.py (+0, -5) (Diff)
/config/win64-vc-config.py (+0, -5) (Diff)
/extern/Makefile (+0, -4) (Diff)
/intern/CMakeLists.txt (+1, -1) (Diff)
/intern/ghost/test/multitest/Makefile (+0, -2) (Diff)
/intern/Makefile (+1, -1) (Diff)
/intern/SConscript (+0, -1) (Diff)
/SConstruct (+0, -1) (Diff)
/source/blender/blenfont/BLF_api.h (+14, -11) (Diff)
/source/blender/blenfont/CMakeLists.txt (+1, -7) (Diff)
/source/blender/blenfont/intern/blf.c (+116, -33) (Diff)
/source/blender/blenfont/intern/blf_dir.c (+0, -4) (Diff)
/source/blender/blenfont/intern/blf_font.c (+0, -20) (Diff)
/source/blender/blenfont/intern/blf_glyph.c (+61, -8) (Diff)
/source/blender/blenfont/intern/blf_internal.h (+0, -9) (Diff)
/source/blender/blenfont/intern/blf_internal_types.h (+0, -21) (Diff)
/source/blender/blenfont/intern/blf_util.c (+16, -86) (Diff)
/source/blender/blenfont/intern/Makefile (+0, -5) (Diff)
/source/blender/blenfont/SConscript (+1, -6) (Diff)
/source/blender/blenkernel/BKE_global.h (+0, -4) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+1, -5) (Diff)
/source/blender/blenkernel/intern/depsgraph.c (+0, -2) (Diff)
/source/blender/blenkernel/intern/font.c (+6, -14) (Diff)
/source/blender/blenkernel/intern/gpencil.c (+0, -2) (Diff)
/source/blender/blenkernel/intern/image.c (+4, -4) (Diff)
/source/blender/blenkernel/intern/Makefile (+2, -8) (Diff)
/source/blender/blenkernel/SConscript (+0, -4) (Diff)
/source/blender/blenlib/CMakeLists.txt (+0, -4) (Diff)
/source/blender/blenlib/intern/freetypefont.c (+0, -6) (Diff)
/source/blender/blenlib/intern/Makefile (+0, -3) (Diff)
/source/blender/blenlib/SConscript (+0, -3) (Diff)
/source/blender/editors/armature/editarmature.c (+0, -2) (Diff)
/source/blender/editors/armature/Makefile (+0, -1) (Diff)
/source/blender/editors/armature/reeb.c (+0, -2) (Diff)
/source/blender/editors/armature/SConscript (+1, -1) (Diff)
/source/blender/editors/CMakeLists.txt (+1, -3) (Diff)
/source/blender/editors/curve/editcurve.c (+0, -2) (Diff)
/source/blender/editors/curve/Makefile (+0, -1) (Diff)
/source/blender/editors/curve/SConscript (+1, -1) (Diff)
/source/blender/editors/gpencil/drawgpencil.c (+1, -4) (Diff)
/source/blender/editors/gpencil/editaction_gpencil.c (+0, -2) (Diff)
/source/blender/editors/gpencil/gpencil_edit.c (+0, -2) (Diff)
/source/blender/editors/gpencil/Makefile (+0, -1) (Diff)
/source/blender/editors/gpencil/SConscript (+1, -1) (Diff)
/source/blender/editors/interface/interface_style.c (+3, -12) (Diff)
/source/blender/editors/interface/Makefile (+0, -2) (Diff)
/source/blender/editors/interface/SConscript (+1, -3) (Diff)
/source/blender/editors/interface/view2d.c (+1, -4) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+0, -2) (Diff)
/source/blender/editors/mesh/Makefile (+0, -1) (Diff)
/source/blender/editors/mesh/SConscript (+1, -1) (Diff)
/source/blender/editors/object/Makefile (+0, -1) (Diff)
/source/blender/editors/object/object_edit.c (+0, -2) (Diff)
/source/blender/editors/object/SConscript (+1, -1) (Diff)
/source/blender/editors/physics/Makefile (+0, -1) (Diff)
/source/blender/editors/physics/SConscript (+1, -1) (Diff)
/source/blender/editors/preview/Makefile (+0, -1) (Diff)
/source/blender/editors/preview/SConscript (+1, -1) (Diff)
/source/blender/editors/screen/area.c (+2, -4) (Diff)
/source/blender/editors/screen/CMakeLists.txt (+1, -3) (Diff)
/source/blender/editors/screen/Makefile (+1, -1) (Diff)
/source/blender/editors/screen/SConscript (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/Makefile (+0, -1) (Diff)
/source/blender/editors/sculpt_paint/SConscript (+1, -1) (Diff)
/source/blender/editors/space_file/file_draw.c (+0, -1) (Diff)
/source/blender/editors/space_file/Makefile (+0, -1) (Diff)
/source/blender/editors/space_file/SConscript (+1, -1) (Diff)
/source/blender/editors/space_node/drawnode.c (+0, -2) (Diff)
/source/blender/editors/space_node/Makefile (+0, -1) (Diff)
/source/blender/editors/space_node/node_draw.c (+0, -1) (Diff)
/source/blender/editors/space_node/SConscript (+1, -1) (Diff)
/source/blender/editors/space_outliner/outliner.c (+3, -0) (Diff)
/source/blender/editors/space_sequencer/Makefile (+1, -1) (Diff)
/source/blender/editors/space_sequencer/SConscript (+1, -1) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+10, -9) (Diff)
/source/blender/editors/space_text/SConscript (+1, -1) (Diff)
/source/blender/editors/space_text/text_intern.h (+0, -1) (Diff)
/source/blender/editors/space_view3d/drawarmature.c (+8, -13) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+22, -33) (Diff)
/source/blender/editors/space_view3d/Makefile (+1, -1) (Diff)
/source/blender/editors/space_view3d/SConscript (+2, -2) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+9, -16) (Diff)
/source/blender/editors/space_view3d/view3d_header.c (+0, -2) (Diff)
/source/blender/editors/transform/Makefile (+0, -1) (Diff)
/source/blender/editors/transform/SConscript (+1, -1) (Diff)
/source/blender/nodes/CMakeLists.txt (+0, -4) (Diff)
/source/blender/nodes/SConscript (+0, -3) (Diff)
/source/blender/python/CMakeLists.txt (+0, -5) (Diff)
/source/blender/python/intern/Makefile (+0, -1) (Diff)
/source/blender/windowmanager/CMakeLists.txt (+1, -3) (Diff)
/source/blender/windowmanager/intern/Makefile (+0, -2) (Diff)
/source/blender/windowmanager/intern/wm_init_exit.c (+1, -8) (Diff)
/source/blender/windowmanager/SConscript (+2, -2) (Diff)
/source/creator/CMakeLists.txt (+1, -4) (Diff)
/source/gameengine/BlenderRoutines/CMakeLists.txt (+0, -1) (Diff)
/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp (+3, -8) (Diff)
/source/gameengine/BlenderRoutines/Makefile (+0, -1) (Diff)
/source/gameengine/BlenderRoutines/SConscript (+1, -1) (Diff)
/source/gameengine/Converter/CMakeLists.txt (+0, -1) (Diff)
/source/gameengine/Converter/SConscript (+1, -1) (Diff)
/source/gameengine/GamePlayer/common/CMakeLists.txt (+0, -1) (Diff)
/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp (+1, -3) (Diff)
/source/gameengine/GamePlayer/common/GPC_RenderTools.h (+1, -3) (Diff)
/source/gameengine/GamePlayer/common/Makefile (+0, -1) (Diff)
/source/gameengine/GamePlayer/common/SConscript (+0, -1) (Diff)
/source/gameengine/GamePlayer/common/unix/Makefile (+0, -1) (Diff)
/source/gameengine/GamePlayer/common/windows/Makefile (+0, -1) (Diff)
/source/gameengine/GamePlayer/ghost/CMakeLists.txt (+0, -1) (Diff)
/source/gameengine/GamePlayer/ghost/Makefile (+0, -1) (Diff)
/source/gameengine/GamePlayer/ghost/SConscript (+0, -1) (Diff)
/source/gameengine/Ketsji/CMakeLists.txt (+0, -1) (Diff)
/source/gameengine/Ketsji/SConscript (+1, -1) (Diff)
/source/Makefile (+7, -13) (Diff)
/source/nan_definitions.mk (+0, -35) (Diff)
/tools/Blender.py (+2, -2) (Diff)
/tools/btools.py (+1, -7) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021