merge with 2.5 at r20307. note there were some python hacking necassary for this...
authorJoseph Eagar <joeedh@gmail.com>
Sat, 23 May 2009 03:24:15 +0000 (03:24 +0000)
committerJoseph Eagar <joeedh@gmail.com>
Sat, 23 May 2009 03:24:15 +0000 (03:24 +0000)
[[Split portion of a mixed commit.]]

1037 files changed:
CMake/macros.cmake
CMakeLists.txt
SConstruct
blenderplayer/CMakeLists.txt
config/darwin-config.py
config/irix6-config.py
config/linux2-config.py
config/linuxcross-config.py
config/openbsd3-config.py
config/sunos5-config.py
config/win32-mingw-config.py
config/win32-vc-config.py
config/win64-vc-config.py
extern/CMakeLists.txt
extern/Makefile
extern/SConscript
extern/bFTGL/CMakeLists.txt [deleted file]
extern/bFTGL/COPYING.txt [deleted file]
extern/bFTGL/README.txt [deleted file]
extern/bFTGL/SConscript [deleted file]
extern/bFTGL/cleanup [deleted file]
extern/bFTGL/include/FTBBox.h [deleted file]
extern/bFTGL/include/FTBitmapGlyph.h [deleted file]
extern/bFTGL/include/FTBufferGlyph.h [deleted file]
extern/bFTGL/include/FTCharToGlyphIndexMap.h [deleted file]
extern/bFTGL/include/FTCharmap.h [deleted file]
extern/bFTGL/include/FTContour.h [deleted file]
extern/bFTGL/include/FTExtrdGlyph.h [deleted file]
extern/bFTGL/include/FTFace.h [deleted file]
extern/bFTGL/include/FTFont.h [deleted file]
extern/bFTGL/include/FTGL.h [deleted file]
extern/bFTGL/include/FTGLBitmapFont.h [deleted file]
extern/bFTGL/include/FTGLBufferFont.h [deleted file]
extern/bFTGL/include/FTGLExtrdFont.h [deleted file]
extern/bFTGL/include/FTGLOutlineFont.h [deleted file]
extern/bFTGL/include/FTGLPixmapFont.h [deleted file]
extern/bFTGL/include/FTGLPolygonFont.h [deleted file]
extern/bFTGL/include/FTGLTextureFont.h [deleted file]
extern/bFTGL/include/FTGlyph.h [deleted file]
extern/bFTGL/include/FTGlyphContainer.h [deleted file]
extern/bFTGL/include/FTLibrary.h [deleted file]
extern/bFTGL/include/FTList.h [deleted file]
extern/bFTGL/include/FTOutlineGlyph.h [deleted file]
extern/bFTGL/include/FTPixmapGlyph.h [deleted file]
extern/bFTGL/include/FTPoint.h [deleted file]
extern/bFTGL/include/FTPolyGlyph.h [deleted file]
extern/bFTGL/include/FTSize.h [deleted file]
extern/bFTGL/include/FTTextureGlyph.h [deleted file]
extern/bFTGL/include/FTVector.h [deleted file]
extern/bFTGL/include/FTVectoriser.h [deleted file]
extern/bFTGL/license.txt [deleted file]
extern/bFTGL/make/msvc_7_0/ftgl_static_lib.vcproj [deleted file]
extern/bFTGL/make/msvc_9_0/ftgl_static_lib.vcproj [deleted file]
extern/bFTGL/src/FTBitmapGlyph.cpp [deleted file]
extern/bFTGL/src/FTBufferGlyph.cpp [deleted file]
extern/bFTGL/src/FTCharmap.cpp [deleted file]
extern/bFTGL/src/FTContour.cpp [deleted file]
extern/bFTGL/src/FTExtrdGlyph.cpp [deleted file]
extern/bFTGL/src/FTFace.cpp [deleted file]
extern/bFTGL/src/FTFont.cpp [deleted file]
extern/bFTGL/src/FTGLBitmapFont.cpp [deleted file]
extern/bFTGL/src/FTGLBufferFont.cpp [deleted file]
extern/bFTGL/src/FTGLExtrdFont.cpp [deleted file]
extern/bFTGL/src/FTGLOutlineFont.cpp [deleted file]
extern/bFTGL/src/FTGLPixmapFont.cpp [deleted file]
extern/bFTGL/src/FTGLPolygonFont.cpp [deleted file]
extern/bFTGL/src/FTGLTextureFont.cpp [deleted file]
extern/bFTGL/src/FTGlyph.cpp [deleted file]
extern/bFTGL/src/FTGlyphContainer.cpp [deleted file]
extern/bFTGL/src/FTLibrary.cpp [deleted file]
extern/bFTGL/src/FTOutlineGlyph.cpp [deleted file]
extern/bFTGL/src/FTPixmapGlyph.cpp [deleted file]
extern/bFTGL/src/FTPoint.cpp [deleted file]
extern/bFTGL/src/FTPolyGlyph.cpp [deleted file]
extern/bFTGL/src/FTSize.cpp [deleted file]
extern/bFTGL/src/FTTextureGlyph.cpp [deleted file]
extern/bFTGL/src/FTVectoriser.cpp [deleted file]
extern/bFTGL/src/Makefile [deleted file]
extern/bFTGL/win32_vcpp/README_WIN32.txt [deleted file]
extern/bFTGL/win32_vcpp/ftgl.dsw [deleted file]
extern/bFTGL/win32_vcpp/ftgl_dll/ftgl_dll.dsp [deleted file]
extern/bFTGL/win32_vcpp/ftgl_static_lib/ftgl_static_lib.dsp [deleted file]
extern/bFTGL/win32_vcpp/unit_tests/unit_tests.dsp [deleted file]
extern/bullet2/make/msvc_9_0/Bullet.vcproj
extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
extern/libopenjpeg/opj_includes.h
extern/make/msvc_9_0/build_install_all.vcproj
intern/CMakeLists.txt
intern/Makefile
intern/SConscript
intern/SoundSystem/Makefile
intern/SoundSystem/SND_DependKludge.h
intern/SoundSystem/SoundDefines.h
intern/SoundSystem/dummy/SND_DummyDevice.cpp
intern/SoundSystem/intern/Makefile
intern/SoundSystem/intern/SND_DeviceManager.cpp
intern/SoundSystem/intern/SND_Scene.cpp
intern/SoundSystem/intern/SND_Utils.cpp
intern/SoundSystem/make/msvc_6_0/SoundSystem.dsp
intern/SoundSystem/make/msvc_6_0/dummy/DummySoundSystem.dsp
intern/SoundSystem/make/msvc_6_0/openal/OpenALSoundSystem.dsp
intern/SoundSystem/openal/SND_OpenALDevice.cpp
intern/bmfont/BMF_Api.h [deleted file]
intern/bmfont/BMF_Settings.h [deleted file]
intern/bmfont/CMakeLists.txt [deleted file]
intern/bmfont/Makefile [deleted file]
intern/bmfont/SConscript [deleted file]
intern/bmfont/intern/BDF2BMF.py [deleted file]
intern/bmfont/intern/BMF_Api.cpp [deleted file]
intern/bmfont/intern/BMF_BitmapFont.cpp [deleted file]
intern/bmfont/intern/BMF_BitmapFont.h [deleted file]
intern/bmfont/intern/BMF_font_helv10.cpp [deleted file]
intern/bmfont/intern/BMF_font_helv12.cpp [deleted file]
intern/bmfont/intern/BMF_font_helvb10.cpp [deleted file]
intern/bmfont/intern/BMF_font_helvb12.cpp [deleted file]
intern/bmfont/intern/BMF_font_helvb14.cpp [deleted file]
intern/bmfont/intern/BMF_font_helvb8.cpp [deleted file]
intern/bmfont/intern/BMF_font_scr12.cpp [deleted file]
intern/bmfont/intern/BMF_font_scr14.cpp [deleted file]
intern/bmfont/intern/BMF_font_scr15.cpp [deleted file]
intern/bmfont/intern/Makefile [deleted file]
intern/bmfont/make/msvc_6_0/bmfont.dsp [deleted file]
intern/bmfont/make/msvc_6_0/bmfont.dsw [deleted file]
intern/bmfont/make/msvc_7_0/bmfont.sln [deleted file]
intern/bmfont/make/msvc_7_0/bmfont.vcproj [deleted file]
intern/bmfont/make/msvc_9_0/bmfont.vcproj [deleted file]
intern/bmfont/test/Makefile [deleted file]
intern/bmfont/test/make/msvc_6_0/BMF_Test.dsp [deleted file]
intern/bmfont/test/make/msvc_6_0/BMF_Test.dsw [deleted file]
intern/bmfont/test/simpletest/BMF_Test.cpp [deleted file]
intern/bmfont/test/simpletest/Makefile [deleted file]
intern/boolop/intern/BOP_Merge2.cpp
intern/boolop/intern/BOP_Misc.h
intern/boolop/make/msvc_6_0/boolop.dsp
intern/bsp/make/msvc6_0/bsplib.dsp
intern/bsp/make/msvc6_0/bsplib.dsw
intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp
intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsw
intern/container/make/msvc_6_0/container.dsp
intern/container/make/msvc_6_0/container.dsw
intern/decimation/make/msvc_6_0/decimation.dsp
intern/decimation/make/msvc_6_0/decimation.dsw
intern/elbeem/make/msvc_6_0/elbeem.dsp
intern/ghost/intern/GHOST_SystemWin32.cpp
intern/ghost/intern/GHOST_SystemX11.cpp
intern/ghost/intern/GHOST_SystemX11.h
intern/ghost/make/msvc/ghost.dsp
intern/ghost/make/msvc/ghost.dsw
intern/ghost/test/make/msvc_6_0/gears.dsp
intern/ghost/test/make/msvc_6_0/gears_C.dsp
intern/ghost/test/make/msvc_6_0/ghost_test.dsw
intern/ghost/test/multitest/Makefile
intern/guardedalloc/mmap_win.h
intern/iksolver/make/msvc_6_0/iksolver.dsp
intern/iksolver/make/msvc_6_0/iksolver.dsw
intern/iksolver/test/ik_glut_test/make/msvc_6_0/ik_glut_test.dsp
intern/iksolver/test/ik_glut_test/make/msvc_6_0/ik_glut_test.dsw
intern/make/msvc_6_0/build_install_all.dsp
intern/make/msvc_6_0/intern.dsw
intern/memutil/make/msvc_60/memutil.dsp
intern/memutil/make/msvc_60/memutil.dsw
intern/moto/include/MT_Quaternion.inl
intern/moto/make/msvc_6_0/MoTo.dsp
intern/moto/make/msvc_6_0/MoTo.dsw
intern/opennl/make/msvc_6_0/OpenNL.dsp
intern/opennl/make/msvc_6_0/OpenNL.dsw
intern/string/make/msvc_6_0/string.dsp
intern/string/make/msvc_6_0/string.dsw
po/Makefile
projectfiles/blender/BLO_readblenfile/BLO_readblenfile.dsp
projectfiles/blender/BPY_python/BPY_python.dsp
projectfiles/blender/avi/BL_avi.dsp
projectfiles/blender/blender.dsp
projectfiles/blender/blender.dsw
projectfiles/blender/blenkernel/BKE_blenkernel.dsp
projectfiles/blender/blenlib/BLI_blenlib.dsp
projectfiles/blender/blenpluginapi/blenpluginapi/blenpluginapi.dsp
projectfiles/blender/ftfont/FTF_ftfont.dsp
projectfiles/blender/glut/BL_glut.dsp
projectfiles/blender/imbuf/BL_imbuf.dsp
projectfiles/blender/img/BL_img.dsp
projectfiles/blender/loader/BLO_loader.dsp
projectfiles/blender/makesdna/DNA_makesdna.dsp
projectfiles/blender/radiosity/BRA_radiosity.dsp
projectfiles/blender/render/BRE_render.dsp
projectfiles/blender/renderconverter/BRE_renderconverter.dsp
projectfiles/blender/src/BL_src.dsp
projectfiles/blender/src/BL_src_cre.dsp
projectfiles/datatoc/datatoc.dsp
projectfiles/gameengine/blenderhook/KX_blenderhook.dsp
projectfiles/gameengine/converter/KX_converter.dsp
projectfiles/gameengine/expression/EXP_expressions.dsp
projectfiles/gameengine/gamelogic/SCA_gamelogic.dsp
projectfiles/gameengine/gameplayer/axctl/GP_axctl.dsp
projectfiles/gameengine/gameplayer/common/GP_common.dsp
projectfiles/gameengine/gameplayer/ghost/GP_ghost.dsp
projectfiles/gameengine/gameplayer/glut/GP_glut.dsp
projectfiles/gameengine/gameplayer/loader/BlenderLoader/BlenderLoader.dsp
projectfiles/gameengine/gameplayer/netscape/GP_netscape.dsp
projectfiles/gameengine/gameplayer/netscape2/GP_netscape.dsp
projectfiles/gameengine/gameplayer/ps2/GP_ps2.dsp
projectfiles/gameengine/gameplayer/qt/gp.dsp
projectfiles/gameengine/gameplayer/qt/gpplugin.dsp
projectfiles/gameengine/gameplayer/qt/qtgp.dsw
projectfiles/gameengine/gameplayer/sdl/GP_sdl.dsp
projectfiles/gameengine/ketsji/KX_ketsji.dsp
projectfiles/gameengine/ketsji/network/KX_network.dsp
projectfiles/gameengine/network/loopbacknetwork/NG_loopbacknetwork.dsp
projectfiles/gameengine/network/network/NG_network.dsp
projectfiles/gameengine/network/terraplaynetwork/NG_terraplaynetwork.dsp
projectfiles/gameengine/physics/PHY_Physics/PHY_Dummy/PHY_Dummy.dsp
projectfiles/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.dsp
projectfiles/gameengine/physics/PHY_Physics/PHY_Physics.dsp
projectfiles/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.dsp
projectfiles/gameengine/rasterizer/RAS_rasterizer.dsp
projectfiles/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.dsp
projectfiles/gameengine/scenegraph/SG_scenegraph.dsp
projectfiles/kernel/gen_messaging/gen_messaging.dsp
projectfiles/kernel/system/SYS_system.dsp
projectfiles/sumo/fuzzics/SM_fuzzics.dsp
projectfiles/sumo/moto/SM_moto.dsp
projectfiles/sumo/solid/SM_solid.dsp
projectfiles_vc7/sumo/moto/SM_moto.dsp
projectfiles_vc7/sumo/solid/SM_solid.dsp
projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
projectfiles_vc9/blender/blender.sln
projectfiles_vc9/blender/blender.vcproj
projectfiles_vc9/blender/blenfont/BLF_blenfont.vcproj
projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
projectfiles_vc9/blender/editors/ED_editors.vcproj
projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
projectfiles_vc9/blender/nodes/nodes.vcproj
projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj
projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Physics.vcproj
release/Makefile
release/VERSION
release/datafiles/blenderbuttons
release/datafiles/prvicons
release/getversion.py
release/scripts/3ds_import.py
release/scripts/bevel_center.py
release/scripts/bpymodules/dxfLibrary.py
release/scripts/export_dxf.py
release/scripts/image_auto_layout.py
release/scripts/import_dxf.py
release/scripts/import_obj.py
release/scripts/import_web3d.py [changed mode: 0755->0644]
release/scripts/mesh_poly_reduce_grid.py [new file with mode: 0644]
release/scripts/scripttemplate_camera_object.py [moved from release/scripts/scripttemplate_camer_object.py with 100% similarity]
release/scripts/uvcalc_smart_project.py
release/ui/buttons_data_armature.py [new file with mode: 0644]
release/ui/buttons_data_bone.py [new file with mode: 0644]
release/ui/buttons_data_camera.py [new file with mode: 0644]
release/ui/buttons_data_curve.py [new file with mode: 0644]
release/ui/buttons_data_empty.py [new file with mode: 0644]
release/ui/buttons_data_lamp.py [new file with mode: 0644]
release/ui/buttons_data_lattice.py [new file with mode: 0644]
release/ui/buttons_data_modifier.py [new file with mode: 0644]
release/ui/buttons_data_text.py [new file with mode: 0644]
release/ui/buttons_material.py [new file with mode: 0644]
release/ui/buttons_objects.py [new file with mode: 0644]
release/ui/buttons_scene.py [new file with mode: 0644]
release/ui/buttons_world.py [new file with mode: 0644]
release/ui/space_text.py [new file with mode: 0644]
release/windows/specific.sh
source/Makefile
source/SConscript
source/blender/CMakeLists.txt
source/blender/Makefile
source/blender/SConscript
source/blender/blenfont/BLF_api.h
source/blender/blenfont/CMakeLists.txt
source/blender/blenfont/SConscript
source/blender/blenfont/intern/Makefile
source/blender/blenfont/intern/blf.c
source/blender/blenfont/intern/blf_dir.c
source/blender/blenfont/intern/blf_font.c
source/blender/blenfont/intern/blf_font_helv10.h [deleted file]
source/blender/blenfont/intern/blf_glyph.c
source/blender/blenfont/intern/blf_internal.c [deleted file]
source/blender/blenfont/intern/blf_internal.h
source/blender/blenfont/intern/blf_internal_types.h
source/blender/blenfont/intern/blf_lang.c
source/blender/blenfont/intern/blf_util.c
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/BKE_action.h
source/blender/blenkernel/BKE_animsys.h
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/BKE_bmesh.h
source/blender/blenkernel/BKE_bmeshCustomData.h
source/blender/blenkernel/BKE_booleanops.h
source/blender/blenkernel/BKE_bvhutils.h
source/blender/blenkernel/BKE_cloth.h
source/blender/blenkernel/BKE_collision.h
source/blender/blenkernel/BKE_colortools.h
source/blender/blenkernel/BKE_constraint.h
source/blender/blenkernel/BKE_curve.h
source/blender/blenkernel/BKE_fcurve.h
source/blender/blenkernel/BKE_global.h
source/blender/blenkernel/BKE_gpencil.h [new file with mode: 0644]
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/BKE_particle.h
source/blender/blenkernel/BKE_scene.h
source/blender/blenkernel/BKE_screen.h
source/blender/blenkernel/BKE_shrinkwrap.h
source/blender/blenkernel/BKE_suggestions.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/BME_Customdata.c
source/blender/blenkernel/intern/BME_conversions.c
source/blender/blenkernel/intern/BME_eulers.c
source/blender/blenkernel/intern/BME_mesh.c
source/blender/blenkernel/intern/BME_structure.c
source/blender/blenkernel/intern/BME_tools.c
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/Makefile
source/blender/blenkernel/intern/action.c
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/bmesh_private.h
source/blender/blenkernel/intern/booleanops.c
source/blender/blenkernel/intern/bvhutils.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/colortools.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/context.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/exotic.c
source/blender/blenkernel/intern/fcurve.c
source/blender/blenkernel/intern/font.c
source/blender/blenkernel/intern/gpencil.c [new file with mode: 0644]
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/ipo.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/screen.c
source/blender/blenkernel/intern/shrinkwrap.c
source/blender/blenkernel/intern/suggestions.c
source/blender/blenkernel/intern/text.c
source/blender/blenkernel/intern/world.c
source/blender/blenkernel/intern/writeffmpeg.c
source/blender/blenlib/BLI_noise.h
source/blender/blenlib/BLI_rect.h
source/blender/blenlib/BLI_string.h
source/blender/blenlib/BLI_util.h
source/blender/blenlib/CMakeLists.txt
source/blender/blenlib/SConscript
source/blender/blenlib/intern/Makefile
source/blender/blenlib/intern/fileops.c
source/blender/blenlib/intern/freetypefont.c
source/blender/blenlib/intern/psfont.c
source/blender/blenlib/intern/string.c
source/blender/blenlib/intern/util.c
source/blender/blenloader/intern/readblenentry.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/CMakeLists.txt
source/blender/editors/animation/anim_channels.c
source/blender/editors/animation/anim_draw.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/animation/anim_intern.h [new file with mode: 0644]
source/blender/editors/animation/anim_ipo_utils.c
source/blender/editors/animation/anim_markers.c
source/blender/editors/animation/anim_ops.c
source/blender/editors/animation/drivers.c [new file with mode: 0644]
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/animation/keyframing.c
source/blender/editors/animation/keyingsets.c [new file with mode: 0644]
source/blender/editors/armature/BIF_generate.h
source/blender/editors/armature/BIF_retarget.h
source/blender/editors/armature/Makefile
source/blender/editors/armature/SConscript
source/blender/editors/armature/armature_intern.h
source/blender/editors/armature/armature_ops.c
source/blender/editors/armature/editarmature.c
source/blender/editors/armature/editarmature_generate.c
source/blender/editors/armature/editarmature_retarget.c
source/blender/editors/armature/editarmature_sketch.c
source/blender/editors/armature/poselib.c
source/blender/editors/armature/poseobject.c
source/blender/editors/armature/reeb.c
source/blender/editors/curve/Makefile
source/blender/editors/curve/SConscript
source/blender/editors/curve/curve_intern.h
source/blender/editors/curve/curve_ops.c
source/blender/editors/curve/editcurve.c
source/blender/editors/curve/editfont.c
source/blender/editors/datafiles/blenderbuttons.c
source/blender/editors/datafiles/prvicons.c
source/blender/editors/gpencil/Makefile
source/blender/editors/gpencil/SConscript
source/blender/editors/gpencil/drawgpencil.c
source/blender/editors/gpencil/editaction_gpencil.c
source/blender/editors/gpencil/gpencil_edit.c [moved from source/blender/editors/gpencil/gpencil.c with 81% similarity]
source/blender/editors/gpencil/gpencil_intern.h
source/blender/editors/include/BIF_glutil.h
source/blender/editors/include/BIF_transform.h
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/ED_fileselect.h
source/blender/editors/include/ED_gpencil.h
source/blender/editors/include/ED_keyframes_edit.h
source/blender/editors/include/ED_keyframing.h
source/blender/editors/include/ED_markers.h
source/blender/editors/include/ED_mesh.h
source/blender/editors/include/ED_screen.h
source/blender/editors/include/ED_util.h
source/blender/editors/include/ED_view3d.h
source/blender/editors/include/UI_interface.h
source/blender/editors/include/UI_resources.h
source/blender/editors/include/UI_view2d.h
source/blender/editors/interface/Makefile
source/blender/editors/interface/SConscript
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_anim.c [new file with mode: 0644]
source/blender/editors/interface/interface_api.c [new file with mode: 0644]
source/blender/editors/interface/interface_draw.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_icons.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_layout.c
source/blender/editors/interface/interface_panel.c
source/blender/editors/interface/interface_regions.c
source/blender/editors/interface/interface_style.c [new file with mode: 0644]
source/blender/editors/interface/interface_templates.c [new file with mode: 0644]
source/blender/editors/interface/interface_utils.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/interface/resources.c
source/blender/editors/interface/text.c [deleted file]
source/blender/editors/interface/view2d.c
source/blender/editors/interface/view2d_ops.c
source/blender/editors/mesh/Makefile
source/blender/editors/mesh/SConscript
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/mesh/bmeshutils.c
source/blender/editors/mesh/bmeshutils_mods.c
source/blender/editors/mesh/editdeform.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/mesh/editmesh_add.c
source/blender/editors/mesh/editmesh_lib.c
source/blender/editors/mesh/editmesh_loop.c
source/blender/editors/mesh/editmesh_mods.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/mesh_intern.h
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/object/Makefile
source/blender/editors/object/SConscript
source/blender/editors/object/editconstraint.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_modifier.c [new file with mode: 0644]
source/blender/editors/object/object_ops.c
source/blender/editors/physics/Makefile
source/blender/editors/physics/SConscript
source/blender/editors/physics/editparticle.c
source/blender/editors/physics/physics_intern.h
source/blender/editors/preview/Makefile
source/blender/editors/preview/SConscript
source/blender/editors/preview/previewrender.c
source/blender/editors/screen/CMakeLists.txt
source/blender/editors/screen/Makefile
source/blender/editors/screen/SConscript
source/blender/editors/screen/area.c
source/blender/editors/screen/glutil.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/Makefile
source/blender/editors/sculpt_paint/SConscript
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_action/action_draw.c
source/blender/editors/space_action/action_edit.c
source/blender/editors/space_action/action_header.c
source/blender/editors/space_action/action_ops.c
source/blender/editors/space_action/action_select.c
source/blender/editors/space_buttons/buttons_header.c
source/blender/editors/space_buttons/buttons_intern.h
source/blender/editors/space_buttons/buttons_object.c [deleted file]
source/blender/editors/space_buttons/buttons_scene.c [deleted file]
source/blender/editors/space_buttons/space_buttons.c
source/blender/editors/space_file/Makefile
source/blender/editors/space_file/SConscript
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_file/file_header.c
source/blender/editors/space_file/file_intern.h
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_file/filelist.h
source/blender/editors/space_file/filesel.c
source/blender/editors/space_file/fsmenu.c
source/blender/editors/space_graph/graph_buttons.c
source/blender/editors/space_graph/graph_draw.c
source/blender/editors/space_graph/graph_edit.c
source/blender/editors/space_graph/graph_header.c
source/blender/editors/space_graph/graph_intern.h
source/blender/editors/space_graph/graph_ops.c
source/blender/editors/space_graph/graph_select.c
source/blender/editors/space_graph/space_graph.c
source/blender/editors/space_image/SConscript
source/blender/editors/space_image/image_buttons.c [moved from source/blender/editors/space_image/image_panels.c with 93% similarity]
source/blender/editors/space_image/image_draw.c
source/blender/editors/space_image/image_header.c
source/blender/editors/space_image/image_intern.h
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_info/info_header.c
source/blender/editors/space_info/space_info.c
source/blender/editors/space_nla/nla_header.c
source/blender/editors/space_node/Makefile
source/blender/editors/space_node/SConscript
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_draw.c
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_node/node_header.c
source/blender/editors/space_node/node_intern.h
source/blender/editors/space_node/node_ops.c
source/blender/editors/space_node/space_node.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/space_outliner/outliner_header.c
source/blender/editors/space_outliner/outliner_intern.h
source/blender/editors/space_outliner/outliner_ops.c
source/blender/editors/space_outliner/space_outliner.c
source/blender/editors/space_script/script_edit.c
source/blender/editors/space_script/script_header.c
source/blender/editors/space_script/script_intern.h
source/blender/editors/space_script/script_ops.c
source/blender/editors/space_script/space_script.c
source/blender/editors/space_sequencer/Makefile
source/blender/editors/space_sequencer/SConscript
source/blender/editors/space_sequencer/sequencer_add.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_sequencer/sequencer_header.c
source/blender/editors/space_sequencer/sequencer_intern.h
source/blender/editors/space_sequencer/sequencer_ops.c
source/blender/editors/space_sound/sound_header.c
source/blender/editors/space_text/SConscript
source/blender/editors/space_text/space_text.c
source/blender/editors/space_text/text_header.c
source/blender/editors/space_text/text_intern.h
source/blender/editors/space_text/text_ops.c
source/blender/editors/space_time/time_header.c
source/blender/editors/space_view3d/Makefile
source/blender/editors/space_view3d/SConscript
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/editors/space_view3d/view3d_ops.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/editors/space_view3d/view3d_toolbar.c [new file with mode: 0644]
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/transform/Makefile
source/blender/editors/transform/SConscript
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_constraints.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_input.c
source/blender/editors/transform/transform_ops.c
source/blender/editors/transform/transform_orientations.c
source/blender/editors/transform/transform_snap.c
source/blender/editors/util/ed_util.c
source/blender/editors/util/editmode_undo.c
source/blender/editors/util/undo.c
source/blender/editors/uvedit/uvedit_draw.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/editors/uvedit/uvedit_parametrizer.c
source/blender/editors/uvedit/uvedit_parametrizer.h
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/ftfont/CMakeLists.txt [deleted file]
source/blender/ftfont/FTF_Api.h [deleted file]
source/blender/ftfont/Makefile [deleted file]
source/blender/ftfont/SConscript [deleted file]
source/blender/ftfont/intern/FTF_Api.cpp [deleted file]
source/blender/ftfont/intern/FTF_TTFont.cpp [deleted file]
source/blender/ftfont/intern/FTF_TTFont.h [deleted file]
source/blender/ftfont/intern/Makefile [deleted file]
source/blender/gpu/intern/gpu_draw.c
source/blender/imbuf/IMB_imbuf_types.h
source/blender/imbuf/intern/IMB_anim.h
source/blender/imbuf/intern/IMB_jp2.h
source/blender/imbuf/intern/allocimbuf.c
source/blender/imbuf/intern/anim.c
source/blender/imbuf/intern/anim5.c
source/blender/imbuf/intern/dds/Makefile
source/blender/imbuf/intern/scaling.c
source/blender/imbuf/intern/util.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/DNA_actuator_types.h
source/blender/makesdna/DNA_anim_types.h
source/blender/makesdna/DNA_cloth_types.h
source/blender/makesdna/DNA_constraint_types.h
source/blender/makesdna/DNA_customdata_types.h
source/blender/makesdna/DNA_gpencil_types.h
source/blender/makesdna/DNA_material_types.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_object_fluidsim.h
source/blender/makesdna/DNA_object_force.h
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_particle_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_screen_types.h
source/blender/makesdna/DNA_sensor_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/makesdna/DNA_world_types.h
source/blender/makesdna/intern/SConscript
source/blender/makesdna/intern/dna_genfile.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_define.h
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/RNA_types.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/Makefile
source/blender/makesrna/intern/SConscript
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_animation.c
source/blender/makesrna/intern/rna_armature.c
source/blender/makesrna/intern/rna_camera.c
source/blender/makesrna/intern/rna_cloth.c
source/blender/makesrna/intern/rna_context.c
source/blender/makesrna/intern/rna_curve.c
source/blender/makesrna/intern/rna_define.c
source/blender/makesrna/intern/rna_fcurve.c [new file with mode: 0644]
source/blender/makesrna/intern/rna_fluidsim.c
source/blender/makesrna/intern/rna_image.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_internal_types.h
source/blender/makesrna/intern/rna_lamp.c
source/blender/makesrna/intern/rna_material.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_particle.c
source/blender/makesrna/intern/rna_pose.c
source/blender/makesrna/intern/rna_rna.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_screen.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_text.c
source/blender/makesrna/intern/rna_texture.c
source/blender/makesrna/intern/rna_ui.c [new file with mode: 0644]
source/blender/makesrna/intern/rna_userdef.c
source/blender/makesrna/intern/rna_wm.c
source/blender/makesrna/intern/rna_world.c
source/blender/nodes/CMakeLists.txt
source/blender/nodes/SConscript
source/blender/nodes/TEX_node.h
source/blender/nodes/intern/CMP_nodes/CMP_normalize.c
source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
source/blender/nodes/intern/SHD_nodes/SHD_invert.c
source/blender/nodes/intern/TEX_nodes/Makefile
source/blender/nodes/intern/TEX_nodes/TEX_image.c
source/blender/nodes/intern/TEX_nodes/TEX_texture.c
source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c
source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
source/blender/nodes/intern/TEX_util.c
source/blender/python/BPY_extern.h
source/blender/python/CMakeLists.txt
source/blender/python/SConscript
source/blender/python/epy_doc_gen.py
source/blender/python/intern/Makefile
source/blender/python/intern/bpy_compat.h
source/blender/python/intern/bpy_interface.c
source/blender/python/intern/bpy_operator.c
source/blender/python/intern/bpy_operator.h
source/blender/python/intern/bpy_operator_wrap.c [moved from source/blender/python/intern/bpy_opwrapper.c with 74% similarity]
source/blender/python/intern/bpy_operator_wrap.h [moved from source/blender/python/intern/bpy_opwrapper.h with 95% similarity]
source/blender/python/intern/bpy_rna.c
source/blender/python/intern/bpy_rna.h
source/blender/python/intern/bpy_ui.c
source/blender/python/intern/bpy_util.c
source/blender/python/intern/bpy_util.h
source/blender/python/intern/stubs.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/raytrace.c
source/blender/render/intern/source/rendercore.c
source/blender/render/intern/source/renderdatabase.c
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/SConscript
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/Makefile
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_subwindow.c
source/blender/windowmanager/intern/wm_window.c
source/creator/CMakeLists.txt
source/creator/Makefile
source/creator/SConscript
source/creator/creator.c
source/darwin/Makefile
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
source/gameengine/BlenderRoutines/CMakeLists.txt
source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp
source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
source/gameengine/BlenderRoutines/Makefile
source/gameengine/BlenderRoutines/SConscript
source/gameengine/Converter/BL_ActionActuator.cpp
source/gameengine/Converter/BL_ActionActuator.h
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Converter/BL_ShapeActionActuator.cpp
source/gameengine/Converter/BL_ShapeActionActuator.h
source/gameengine/Converter/CMakeLists.txt
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
source/gameengine/Converter/KX_ConvertActuators.cpp
source/gameengine/Converter/KX_ConvertSensors.cpp
source/gameengine/Converter/SConscript
source/gameengine/Expressions/BoolValue.cpp
source/gameengine/Expressions/BoolValue.h
source/gameengine/Expressions/ConstExpr.cpp
source/gameengine/Expressions/ConstExpr.h
source/gameengine/Expressions/EmptyValue.cpp
source/gameengine/Expressions/EmptyValue.h
source/gameengine/Expressions/ErrorValue.cpp
source/gameengine/Expressions/ErrorValue.h
source/gameengine/Expressions/FloatValue.cpp
source/gameengine/Expressions/FloatValue.h
source/gameengine/Expressions/InputParser.cpp
source/gameengine/Expressions/InputParser.h
source/gameengine/Expressions/IntValue.cpp
source/gameengine/Expressions/IntValue.h
source/gameengine/Expressions/ListValue.cpp
source/gameengine/Expressions/ListValue.h
source/gameengine/Expressions/PyObjectPlus.cpp
source/gameengine/Expressions/PyObjectPlus.h
source/gameengine/Expressions/StringValue.cpp
source/gameengine/Expressions/StringValue.h
source/gameengine/Expressions/Value.cpp
source/gameengine/Expressions/Value.h
source/gameengine/Expressions/VectorValue.cpp
source/gameengine/Expressions/VectorValue.h
source/gameengine/Expressions/VoidValue.h
source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
source/gameengine/GameLogic/Joystick/SCA_Joystick.h
source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h
source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
source/gameengine/GameLogic/SCA_2DFilterActuator.h
source/gameengine/GameLogic/SCA_ANDController.cpp
source/gameengine/GameLogic/SCA_ANDController.h
source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
source/gameengine/GameLogic/SCA_ActuatorSensor.h
source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
source/gameengine/GameLogic/SCA_AlwaysSensor.h
source/gameengine/GameLogic/SCA_DelaySensor.cpp
source/gameengine/GameLogic/SCA_DelaySensor.h
source/gameengine/GameLogic/SCA_ExpressionController.cpp
source/gameengine/GameLogic/SCA_ExpressionController.h
source/gameengine/GameLogic/SCA_ILogicBrick.cpp
source/gameengine/GameLogic/SCA_ILogicBrick.h
source/gameengine/GameLogic/SCA_IObject.cpp
source/gameengine/GameLogic/SCA_IObject.h
source/gameengine/GameLogic/SCA_ISensor.cpp
source/gameengine/GameLogic/SCA_ISensor.h
source/gameengine/GameLogic/SCA_JoystickSensor.cpp
source/gameengine/GameLogic/SCA_JoystickSensor.h
source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
source/gameengine/GameLogic/SCA_KeyboardSensor.h
source/gameengine/GameLogic/SCA_MouseSensor.cpp
source/gameengine/GameLogic/SCA_MouseSensor.h
source/gameengine/GameLogic/SCA_NANDController.cpp
source/gameengine/GameLogic/SCA_NANDController.h
source/gameengine/GameLogic/SCA_NORController.cpp
source/gameengine/GameLogic/SCA_NORController.h
source/gameengine/GameLogic/SCA_ORController.cpp
source/gameengine/GameLogic/SCA_ORController.h
source/gameengine/GameLogic/SCA_PropertyActuator.cpp
source/gameengine/GameLogic/SCA_PropertyActuator.h
source/gameengine/GameLogic/SCA_PropertySensor.cpp
source/gameengine/GameLogic/SCA_PropertySensor.h
source/gameengine/GameLogic/SCA_PythonController.cpp
source/gameengine/GameLogic/SCA_PythonController.h
source/gameengine/GameLogic/SCA_RandomActuator.cpp
source/gameengine/GameLogic/SCA_RandomActuator.h
source/gameengine/GameLogic/SCA_RandomSensor.cpp
source/gameengine/GameLogic/SCA_RandomSensor.h
source/gameengine/GameLogic/SCA_XNORController.cpp
source/gameengine/GameLogic/SCA_XNORController.h
source/gameengine/GameLogic/SCA_XORController.cpp
source/gameengine/GameLogic/SCA_XORController.h
source/gameengine/GamePlayer/common/CMakeLists.txt
source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp
source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
source/gameengine/GamePlayer/common/GPC_RenderTools.h
source/gameengine/GamePlayer/common/Makefile
source/gameengine/GamePlayer/common/SConscript
source/gameengine/GamePlayer/common/unix/Makefile
source/gameengine/GamePlayer/common/windows/Makefile
source/gameengine/GamePlayer/ghost/CMakeLists.txt
source/gameengine/GamePlayer/ghost/GPG_Application.cpp
source/gameengine/GamePlayer/ghost/GPG_Application.h
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
source/gameengine/GamePlayer/ghost/Makefile
source/gameengine/GamePlayer/ghost/SConscript
source/gameengine/Ketsji/BL_BlenderShader.cpp
source/gameengine/Ketsji/BL_Shader.cpp
source/gameengine/Ketsji/BL_Shader.h
source/gameengine/Ketsji/CMakeLists.txt
source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
source/gameengine/Ketsji/KX_BlenderMaterial.cpp
source/gameengine/Ketsji/KX_BlenderMaterial.h
source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
source/gameengine/Ketsji/KX_BulletPhysicsController.h
source/gameengine/Ketsji/KX_CDActuator.cpp
source/gameengine/Ketsji/KX_CDActuator.h
source/gameengine/Ketsji/KX_Camera.cpp
source/gameengine/Ketsji/KX_Camera.h
source/gameengine/Ketsji/KX_CameraActuator.cpp
source/gameengine/Ketsji/KX_CameraActuator.h
source/gameengine/Ketsji/KX_ConstraintActuator.cpp
source/gameengine/Ketsji/KX_ConstraintActuator.h
source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
source/gameengine/Ketsji/KX_ConstraintWrapper.h
source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
source/gameengine/Ketsji/KX_Dome.cpp [new file with mode: 0644]
source/gameengine/Ketsji/KX_Dome.h [new file with mode: 0644]
source/gameengine/Ketsji/KX_GameActuator.cpp
source/gameengine/Ketsji/KX_GameActuator.h
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_GameObject.h
source/gameengine/Ketsji/KX_IPhysicsController.h
source/gameengine/Ketsji/KX_IpoActuator.cpp
source/gameengine/Ketsji/KX_IpoActuator.h
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
source/gameengine/Ketsji/KX_KetsjiEngine.h
source/gameengine/Ketsji/KX_Light.cpp
source/gameengine/Ketsji/KX_Light.h
source/gameengine/Ketsji/KX_MeshProxy.cpp
source/gameengine/Ketsji/KX_MeshProxy.h
source/gameengine/Ketsji/KX_MotionState.cpp
source/gameengine/Ketsji/KX_MotionState.h
source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
source/gameengine/Ketsji/KX_MouseFocusSensor.h
source/gameengine/Ketsji/KX_NearSensor.cpp
source/gameengine/Ketsji/KX_NearSensor.h
source/gameengine/Ketsji/KX_ObjectActuator.cpp
source/gameengine/Ketsji/KX_ObjectActuator.h
source/gameengine/Ketsji/KX_OdePhysicsController.h
source/gameengine/Ketsji/KX_ParentActuator.cpp
source/gameengine/Ketsji/KX_ParentActuator.h
source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
source/gameengine/Ketsji/KX_PolyProxy.cpp
source/gameengine/Ketsji/KX_PolyProxy.h
source/gameengine/Ketsji/KX_PolygonMaterial.cpp
source/gameengine/Ketsji/KX_PolygonMaterial.h
source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
source/gameengine/Ketsji/KX_PyMath.cpp
source/gameengine/Ketsji/KX_PyMath.h
source/gameengine/Ketsji/KX_PythonInit.cpp
source/gameengine/Ketsji/KX_PythonInit.h
source/gameengine/Ketsji/KX_PythonInitTypes.cpp [new file with mode: 0644]
source/gameengine/Ketsji/KX_PythonInitTypes.h [new file with mode: 0644]
source/gameengine/Ketsji/KX_RadarSensor.cpp
source/gameengine/Ketsji/KX_RadarSensor.h
source/gameengine/Ketsji/KX_RayCast.cpp
source/gameengine/Ketsji/KX_RaySensor.cpp
source/gameengine/Ketsji/KX_RaySensor.h
source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.cpp
source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
source/gameengine/Ketsji/KX_SG_NodeRelationships.cpp
source/gameengine/Ketsji/KX_SG_NodeRelationships.h
source/gameengine/Ketsji/KX_Scene.cpp
source/gameengine/Ketsji/KX_Scene.h
source/gameengine/Ketsji/KX_SceneActuator.cpp
source/gameengine/Ketsji/KX_SceneActuator.h
source/gameengine/Ketsji/KX_SoundActuator.cpp
source/gameengine/Ketsji/KX_SoundActuator.h
source/gameengine/Ketsji/KX_StateActuator.cpp
source/gameengine/Ketsji/KX_StateActuator.h
source/gameengine/Ketsji/KX_SumoPhysicsController.cpp
source/gameengine/Ketsji/KX_SumoPhysicsController.h
source/gameengine/Ketsji/KX_TouchSensor.cpp
source/gameengine/Ketsji/KX_TouchSensor.h
source/gameengine/Ketsji/KX_TrackToActuator.cpp
source/gameengine/Ketsji/KX_TrackToActuator.h
source/gameengine/Ketsji/KX_VehicleWrapper.cpp
source/gameengine/Ketsji/KX_VehicleWrapper.h
source/gameengine/Ketsji/KX_VertexProxy.cpp
source/gameengine/Ketsji/KX_VertexProxy.h
source/gameengine/Ketsji/KX_VisibilityActuator.cpp
source/gameengine/Ketsji/KX_VisibilityActuator.h
source/gameengine/Ketsji/SConscript
source/gameengine/Network/NG_NetworkScene.h
source/gameengine/Physics/BlOde/OdePhysicsController.h
source/gameengine/Physics/BlOde/OdePhysicsEnvironment.h
source/gameengine/Physics/Bullet/CMakeLists.txt
source/gameengine/Physics/Bullet/CcdGraphicController.cpp [new file with mode: 0644]
source/gameengine/Physics/Bullet/CcdGraphicController.h [new file with mode: 0644]
source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
source/gameengine/Physics/Bullet/CcdPhysicsController.h
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
source/gameengine/Physics/Bullet/Makefile
source/gameengine/Physics/Bullet/SConscript
source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
source/gameengine/Physics/Sumo/SumoPhysicsController.h
source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h
source/gameengine/Physics/common/CMakeLists.txt
source/gameengine/Physics/common/PHY_DynamicTypes.h
source/gameengine/Physics/common/PHY_IController.cpp [moved from intern/bmfont/intern/BMF_FontData.h with 72% similarity]
source/gameengine/Physics/common/PHY_IController.h [moved from source/blender/editors/include/UI_text.h with 61% similarity]
source/gameengine/Physics/common/PHY_IGraphicController.cpp [moved from source/blender/ftfont/FTF_Settings.h with 63% similarity]
source/gameengine/Physics/common/PHY_IGraphicController.h [moved from intern/bmfont/BMF_Fonts.h with 58% similarity]
source/gameengine/Physics/common/PHY_IMotionState.h
source/gameengine/Physics/common/PHY_IPhysicsController.h
source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
source/gameengine/Physics/common/PHY_Pro.h
source/gameengine/Physics/common/SConscript
source/gameengine/PyDoc/BL_ActionActuator.py
source/gameengine/PyDoc/BL_Shader.py [new file with mode: 0644]
source/gameengine/PyDoc/BL_ShapeActionActuator.py
source/gameengine/PyDoc/CListValue.py [new file with mode: 0644]
source/gameengine/PyDoc/GameKeys.py
source/gameengine/PyDoc/GameLogic.py
source/gameengine/PyDoc/GameTypes.py [new file with mode: 0644]
source/gameengine/PyDoc/KX_BlenderMaterial.py [new file with mode: 0644]
source/gameengine/PyDoc/KX_CDActuator.py
source/gameengine/PyDoc/KX_Camera.py
source/gameengine/PyDoc/KX_ConstraintActuator.py
source/gameengine/PyDoc/KX_ConstraintWrapper.py [new file with mode: 0644]
source/gameengine/PyDoc/KX_GameActuator.py
source/gameengine/PyDoc/KX_GameObject.py
source/gameengine/PyDoc/KX_IpoActuator.py
source/gameengine/PyDoc/KX_LightObject.py [moved from source/gameengine/PyDoc/KX_Light.py with 97% similarity]
source/gameengine/PyDoc/KX_MeshProxy.py
source/gameengine/PyDoc/KX_MouseFocusSensor.py
source/gameengine/PyDoc/KX_NetworkMessageActuator.py
source/gameengine/PyDoc/KX_NetworkMessageSensor.py
source/gameengine/PyDoc/KX_ParentActuator.py
source/gameengine/PyDoc/KX_PhysicsObjectWrapper.py [new file with mode: 0644]
source/gameengine/PyDoc/KX_RaySensor.py
source/gameengine/PyDoc/KX_SCA_AddObjectActuator.py
source/gameengine/PyDoc/KX_SCA_DynamicActuator.py [new file with mode: 0644]
source/gameengine/PyDoc/KX_SCA_ReplaceMeshActuator.py
source/gameengine/PyDoc/KX_Scene.py
source/gameengine/PyDoc/KX_SceneActuator.py
source/gameengine/PyDoc/KX_SoundActuator.py
source/gameengine/PyDoc/KX_StateActuator.py
source/gameengine/PyDoc/KX_TouchSensor.py
source/gameengine/PyDoc/KX_TrackToActuator.py
source/gameengine/PyDoc/KX_VehicleWrapper.py [new file with mode: 0644]
source/gameengine/PyDoc/KX_VertexProxy.py
source/gameengine/PyDoc/KX_VisibilityActuator.py
source/gameengine/PyDoc/SCA_2DFilterActuator.py [new file with mode: 0644]
source/gameengine/PyDoc/SCA_ActuatorSensor.py [moved from source/gameengine/PyDoc/KX_ActuatorSensor.py with 87% similarity]
source/gameengine/PyDoc/SCA_ILogicBrick.py
source/gameengine/PyDoc/SCA_JoystickSensor.py
source/gameengine/PyDoc/SCA_KeyboardSensor.py
source/gameengine/PyDoc/SCA_MouseSensor.py
source/gameengine/PyDoc/SCA_NANDController.py [new file with mode: 0644]
source/gameengine/PyDoc/SCA_NORController.py [new file with mode: 0644]
source/gameengine/PyDoc/SCA_RandomSensor.py
source/gameengine/PyDoc/SCA_XNORController.py [new file with mode: 0644]
source/gameengine/PyDoc/SCA_XORController.py [new file with mode: 0644]
source/gameengine/PyDoc/SConscript
source/gameengine/PyDoc/WhatsNew.py
source/gameengine/PyDoc/bge_api_validate_py.txt [new file with mode: 0644]
source/gameengine/PyDoc/epy_docgen.sh [changed mode: 0644->0755]
source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
source/gameengine/Rasterizer/RAS_BucketManager.cpp
source/gameengine/Rasterizer/RAS_FramingManager.h
source/gameengine/Rasterizer/RAS_IRasterizer.h
source/gameengine/Rasterizer/RAS_IRenderTools.h
source/gameengine/Rasterizer/RAS_LightObject.h
source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
source/gameengine/Rasterizer/RAS_MaterialBucket.h
source/gameengine/Rasterizer/RAS_MeshObject.cpp
source/gameengine/Rasterizer/RAS_MeshObject.h
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
source/gameengine/Rasterizer/RAS_Polygon.cpp
source/gameengine/Rasterizer/RAS_Polygon.h
source/gameengine/SceneGraph/SG_BBox.cpp
source/gameengine/SceneGraph/SG_BBox.h
source/gameengine/SceneGraph/SG_IObject.cpp
source/gameengine/SceneGraph/SG_IObject.h
source/gameengine/SceneGraph/SG_Node.cpp
source/gameengine/SceneGraph/SG_Node.h
source/gameengine/SceneGraph/SG_ParentRelation.h
source/gameengine/SceneGraph/SG_Spatial.cpp
source/gameengine/SceneGraph/SG_Spatial.h
source/gameengine/VideoTexture/FilterNormal.cpp
source/gameengine/VideoTexture/FilterSource.h
source/gameengine/VideoTexture/ImageRender.cpp
source/gameengine/VideoTexture/ImageViewport.cpp
source/gameengine/VideoTexture/Texture.cpp
source/gameengine/VideoTexture/VideoBase.cpp
source/gameengine/VideoTexture/VideoFFmpeg.h
source/gameengine/VideoTexture/blendVideoTex.cpp
source/nan_compile.mk
source/nan_definitions.mk
tools/Blender.py
tools/btools.py

index 95799a2c1fdbc1189e3829dbdb53c4610ddf05e6..df8e7515e671cad64f8aac04934abc9a83663fcc 100644 (file)
@@ -43,9 +43,9 @@ MACRO(SETUP_LIBDIRS)
     CMAKE_POLICY(SET CMP0003 NEW)
   endif(COMMAND cmake_policy)
   LINK_DIRECTORIES(${PYTHON_LIBPATH} ${SDL_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${ICONV_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH})
+  LINK_DIRECTORIES(${FREETYPE_LIBPATH})
   IF(WITH_INTERNATIONAL)
     LINK_DIRECTORIES(${GETTEXT_LIBPATH})
-    LINK_DIRECTORIES(${FREETYPE_LIBPATH})
   ENDIF(WITH_INTERNATIONAL)
   IF(WITH_OPENAL)
     LINK_DIRECTORIES(${OPENAL_LIBPATH})
@@ -60,8 +60,25 @@ MACRO(SETUP_LIBLINKS
   target)
   SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS} ")
   TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LIB} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
+
+  TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
+  TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB})
+
+  # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
+
+  IF(WIN32)
+
+            TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d)
+
+            TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB})
+
+            ELSE(WIN32)
+
+            TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB})
+
+  ENDIF(WIN32)
+
   IF(WITH_INTERNATIONAL)
-    TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB})
     TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB})
   ENDIF(WITH_INTERNATIONAL)
   IF(WITH_OPENAL)
index 45caf48091b08b9389aac97efafb792747b7e29c..f2bf65dfb57545e1645d3b6077e166625c087c08 100644 (file)
@@ -223,11 +223,15 @@ IF(WIN32)
   SET(PYTHON_LIB python25)
   SET(PYTHON_LIBPATH ${PYTHON}/lib)
 
-  #SET(WITH_OPENAL ON)
-  SET(OPENAL ${LIBDIR}/openal)
-  SET(OPENAL_INC ${OPENAL}/include ${OPENAL}/include/AL)
-  SET(OPENAL_LIB openal_static)
-  SET(OPENAL_LIBPATH ${OPENAL}/lib)
+  IF(CMAKE_CL_64)
+    SET(WITH_OPENAL OFF)
+  ELSE(CMAKE_CL_64)
+    #SET(WITH_OPENAL ON)
+    SET(OPENAL ${LIBDIR}/openal)
+    SET(OPENAL_INC ${OPENAL}/include ${OPENAL}/include/AL)
+    SET(OPENAL_LIB openal_static)
+    SET(OPENAL_LIBPATH ${OPENAL}/lib)
+  ENDIF(CMAKE_CL_64)
 
   IF(CMAKE_CL_64)
        SET(PNG_LIB libpng)
@@ -238,11 +242,7 @@ IF(WIN32)
 
   SET(ZLIB ${LIBDIR}/zlib)
   SET(ZLIB_INC ${ZLIB}/include)
-  IF(CMAKE_CL_64)
-       SET(ZLIB_LIB zlib)
-  ELSE(CMAKE_CL_64)
-       SET(ZLIB_LIB libz)
-  ENDIF(CMAKE_CL_64)
+  SET(ZLIB_LIB libz)
   SET(ZLIB_LIBPATH ${ZLIB}/lib)
   
   SET(PTHREADS ${LIBDIR}/pthreads)
@@ -436,10 +436,6 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 #-----------------------------------------------------------------------------
 # Common.
 
-SET(FTGL ${CMAKE_SOURCE_DIR}/extern/bFTGL)
-SET(FTGL_INC ${FTGL}/include)
-SET(FTGL_LIB extern_ftgl)
-
 set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
 set(OPENJPEG_INC ${OPENJPEG})
 set(OPENJPEG_LIb extern_libopenjpeg)
index c91b44e3659166161ca687a4ee6ebf60a17c0533..9053efbf4744f43f10775a166ff12a57309eaaca 100644 (file)
@@ -270,29 +270,34 @@ if 'blendernogame' in B.targets:
        env['WITH_BF_GAMEENGINE'] = False
 
 if 'blenderlite' in B.targets:
-       env['WITH_BF_GAMEENGINE'] = False
-       env['WITH_BF_OPENAL'] = False
-       env['WITH_BF_OPENEXR'] = False
-       env['WITH_BF_ICONV'] = False
-       env['WITH_BF_INTERNATIONAL'] = False
-       env['WITH_BF_OPENJPEG'] = False
-       env['WITH_BF_FFMPEG'] = False
-       env['WITH_BF_QUICKTIME'] = False
-       env['WITH_BF_YAFRAY'] = False
-       env['WITH_BF_REDCODE'] = False
-       env['WITH_BF_FTGL'] = False
-       env['WITH_BF_DDS'] = False
-       env['WITH_BF_ZLIB'] = False
-       env['WITH_BF_SDL'] = False
-       env['WITH_BF_JPEG'] = False
-       env['WITH_BF_PNG'] = False
-       env['WITH_BF_ODE'] = False
-       env['WITH_BF_BULLET'] = False
-       env['WITH_BF_SOLID'] = False
-       env['WITH_BF_BINRELOC'] = False
-       env['BF_BUILDINFO'] = False
-       env['BF_NO_ELBEEM'] = True
-       env['WITH_BF_PYTHON'] = False
+       target_env_defs = {}
+       target_env_defs['WITH_BF_GAMEENGINE'] = False
+       target_env_defs['WITH_BF_OPENAL'] = False
+       target_env_defs['WITH_BF_OPENEXR'] = False
+       target_env_defs['WITH_BF_ICONV'] = False
+       target_env_defs['WITH_BF_INTERNATIONAL'] = False
+       target_env_defs['WITH_BF_OPENJPEG'] = False
+       target_env_defs['WITH_BF_FFMPEG'] = False
+       target_env_defs['WITH_BF_QUICKTIME'] = False
+       target_env_defs['WITH_BF_YAFRAY'] = False
+       target_env_defs['WITH_BF_REDCODE'] = False
+       target_env_defs['WITH_BF_DDS'] = False
+       target_env_defs['WITH_BF_ZLIB'] = False
+       target_env_defs['WITH_BF_SDL'] = False
+       target_env_defs['WITH_BF_JPEG'] = False
+       target_env_defs['WITH_BF_PNG'] = False
+       target_env_defs['WITH_BF_ODE'] = False
+       target_env_defs['WITH_BF_BULLET'] = False
+       target_env_defs['WITH_BF_SOLID'] = False
+       target_env_defs['WITH_BF_BINRELOC'] = False
+       target_env_defs['BF_BUILDINFO'] = False
+       target_env_defs['BF_NO_ELBEEM'] = True
+       target_env_defs['WITH_BF_PYTHON'] = False
+       
+       # Merge blenderlite, let command line to override
+       for k,v in target_env_defs.iteritems():
+               if k not in B.arguments:
+                       env[k] = v
 
 if env['WITH_BF_SDL'] == False and env['OURPLATFORM'] in ('win32-vc', 'win32-ming', 'win64-vc'):
        env['PLATFORM_LINKFLAGS'].remove('/ENTRY:mainCRTStartup')
@@ -472,6 +477,17 @@ if  env['OURPLATFORM']!='darwin':
                                source=[dp+os.sep+f for f in df]
                                scriptinstall.append(env.Install(dir=dir,source=source))
 
+                       #-- .blender/ui 
+                       scriptpath='release/ui'
+                       for dp, dn, df in os.walk(scriptpath):
+                               if 'CVS' in dn:
+                                       dn.remove('CVS')
+                               if '.svn' in dn:
+                                       dn.remove('.svn')
+                               dir=env['BF_INSTALLDIR']+'/.blender/ui'+dp[len(scriptpath):]
+                               source=[dp+os.sep+f for f in df]
+                               scriptinstall.append(env.Install(dir=dir,source=source))
+
 #-- icons
 if env['OURPLATFORM']=='linux2':
        iconlist = []
@@ -565,9 +581,11 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc'):
                else:
                        dllsources.append('${BF_SDL_LIBPATH}/SDL.dll')
        if env['WITH_BF_PYTHON']:
-               dllsources.append('#release/windows/extra/python25.zip')
+               ver = env["BF_PYTHON_VERSION"].replace(".", "")
+               
+               dllsources.append('#release/windows/extra/python' + ver + '.zip')
                dllsources.append('#release/windows/extra/zlib.pyd')
-               if env['BF_DEBUG']:
+               if env['BF_DEBUG'] and not env["BF_NO_PYDEBUG"]:
                        dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_LIB}_d.dll')
                else:
                        dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_LIB}.dll')
@@ -577,14 +595,14 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc'):
                else:
                        dllsources += ['${BF_ICONV_LIBPATH}/iconv.dll']
        if env['WITH_BF_FFMPEG']:
-               dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-51.dll',
+               dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-52.dll',
                                                '${LCGDIR}/ffmpeg/lib/avformat-52.dll',
                                                '${LCGDIR}/ffmpeg/lib/avdevice-52.dll',
-                                               '${LCGDIR}/ffmpeg/lib/avutil-49.dll',
-                                               '${LCGDIR}/ffmpeg/lib/libfaad-0.dll',
+                                               '${LCGDIR}/ffmpeg/lib/avutil-50.dll',
+                                               '${LCGDIR}/ffmpeg/lib/libfaad-2.dll',
                                                '${LCGDIR}/ffmpeg/lib/libfaac-0.dll',
                                                '${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll',
-                                               '${LCGDIR}/ffmpeg/lib/libx264-59.dll',
+                                               '${LCGDIR}/ffmpeg/lib/libx264-67.dll',
                                                '${LCGDIR}/ffmpeg/lib/xvidcore.dll',
                                                '${LCGDIR}/ffmpeg/lib/swscale-0.dll']
        windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
@@ -622,6 +640,13 @@ if not env['WITHOUT_BF_INSTALL']:
 
 #------------ EPYDOC
 if env['WITH_BF_DOCS']:
-       SConscript('source/blender/python/api2_2x/doc/SConscript')
-       SConscript('source/gameengine/PyDoc/SConscript')
+       try:            import epydoc
+       except: epydoc = None
+       
+       if epydoc:
+               SConscript('source/blender/python/api2_2x/doc/SConscript')
+               SConscript('source/gameengine/PyDoc/SConscript')
+       else:
+               print "No epydoc install detected, Python API and Gameengine API Docs will not be generated "
+       
 
index b9ac3c7a8c69b67e6f5beea926653e9ebd4f933d..5b13a5f45212a770e1c6ea6e28ce8767f66f2689 100644 (file)
@@ -100,14 +100,11 @@ IF(UNIX)
     extern_bullet 
     bf_guardedalloc 
     bf_memutil 
-    bf_bmfont 
     bf_blenlib 
     bf_cineon 
     bf_openexr 
     extern_libopenjpeg 
     bf_dds
-    bf_ftfont 
-    extern_ftgl 
     bf_readblenfile 
     blenkernel_blc
     bf_quicktime
index 4f002aecef70af6959dac8cbce57b0e0a67dc710..78a8c71b7ddfe1d665d70f50acdaba4dbae1c58a 100644 (file)
@@ -40,11 +40,7 @@ else:
 # enable ffmpeg  support
 WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
 BF_FFMPEG = "#extern/ffmpeg"
-# trick : The version of ffmpeg in extern/ffmpeg uses explicit libav.. directory in #include statements
-#         To keep Blender compatible with older versions, I add ${BF_FFMPEG} to the inc dir so that ffmpeg
-#         finds the files directly in extern/ffmpeg/libav... while blender finds them in
-#         extern/ffmpeg/include. 
-BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}'
+BF_FFMPEG_INC = '${BF_FFMPEG}'
 if USE_SDK==True:
        BF_FFMPEG_EXTRA = '-isysroot '+MACOSX_SDK+' -mmacosx-version-min='+MAC_MIN_VERS
 #BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
@@ -104,9 +100,6 @@ BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
 BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 
-WITH_BF_FMOD = False
-BF_FMOD = LIBDIR + '/fmod'
-
 WITH_BF_OPENEXR = True
 WITH_BF_STATICOPENEXR = False
 BF_OPENEXR = '${LCGDIR}/openexr'
@@ -145,11 +138,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include'
 BF_GETTEXT_LIB = 'intl'
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
-WITH_BF_FTGL = True
-BF_FTGL = '#extern/bFTGL'
-BF_FTGL_INC = '${BF_FTGL}/include'
-BF_FTGL_LIB = 'extern_ftgl'
-
 WITH_BF_GAMEENGINE=True
 WITH_BF_PLAYER=True
 
index cb66dbafcce5a59d9d3365d4b81ae47bdadfcb3e..1ef271b50749ecd528c43546d16fb2c7628a4923 100644 (file)
@@ -30,14 +30,11 @@ WITH_BF_STATICCXX = 'false'
 BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
 
 WITH_BF_SDL = 'true'
-BF_SDL = LCGDIR+'/SDL' #$(shell sdl-config --prefix)
+BF_SDL = LCGDIR+'/sdl' #$(shell sdl-config --prefix)
 BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
 BF_SDL_LIB = 'SDL audio iconv charset' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 
-WITH_BF_FMOD = 'false'
-BF_FMOD = LIBDIR + '/fmod'
-
 WITH_BF_OPENEXR = 'false'
 WITH_BF_STATICOPENEXR = 'false'
 BF_OPENEXR = '/usr'
@@ -80,11 +77,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include'
 BF_GETTEXT_LIB = 'gettextpo intl'
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
-WITH_BF_FTGL = 'true'
-BF_FTGL = '#extern/bFTGL'
-BF_FTGL_INC = '${BF_FTGL}/include'
-BF_FTGL_LIB = 'extern_ftgl'
-
 WITH_BF_GAMEENGINE='false'
 
 WITH_BF_ODE = 'false'
index 45363f16cb06b854897e5988a07a38f8d84dad9e..eb93d8084f172398d80d207d6ab25bf0a95f219f 100644 (file)
@@ -32,9 +32,6 @@ BF_SDL = '/usr' #$(shell sdl-config --prefix)
 BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
 BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
 
-WITH_BF_FMOD = False
-BF_FMOD = LIBDIR + '/fmod'
-
 WITH_BF_OPENEXR = True
 WITH_BF_STATICOPENEXR = False
 BF_OPENEXR = '/usr'
@@ -74,11 +71,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include'
 BF_GETTEXT_LIB = 'gettextlib'
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
-WITH_BF_FTGL = True
-BF_FTGL = '#extern/bFTGL'
-BF_FTGL_INC = '${BF_FTGL}/include'
-BF_FTGL_LIB = 'extern_ftgl'
-
 WITH_BF_GAMEENGINE=False
 
 WITH_BF_ODE = False
@@ -138,19 +130,14 @@ BF_FFMPEG_LIB = ''
 # Uncomment the following two lines to use system's ffmpeg
 # BF_FFMPEG = '/usr'
 # BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
-# trick : The version of ffmpeg in extern/ffmpeg uses explicit libav.. directory in #include statements
-#         To keep Blender compatible with older version, I add ${BF_FFMPEG} to the inc dir so that ffmpeg
-#         finds the files directly in extern/ffmpeg/libav... while blender finds them in
-#         extern/ffmpeg/include. When using system ffmpeg, you don't need that, assuming the system library
-#         still use the flat directory model, otherwise will not compile anyway
-BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}'
+BF_FFMPEG_INC = '${BF_FFMPEG}'
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
 
 # enable ogg, vorbis and theora in ffmpeg
 WITH_BF_OGG = False  # -DWITH_OGG 
 BF_OGG = '/usr'
 BF_OGG_INC = '${BF_OGG}/include'
-BF_OGG_LIB = 'ogg vorbis theoraenc theoradec'
+BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec'
 
 WITH_BF_OPENJPEG = True 
 BF_OPENJPEG = '#extern/libopenjpeg'
index 8c643b75d63375cfef68df687648e7827f2803f6..4b17224eacc488f9c4d9c3c5aefee13f34a5498f 100644 (file)
@@ -35,9 +35,6 @@ BF_PTHREADS_INC = '${BF_PTHREADS}/include'
 BF_PTHREADS_LIB = 'pthreadGC2'
 BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
 
-WITH_BF_FMOD = False
-BF_FMOD = LIBDIR + '/fmod'
-
 WITH_BF_OPENEXR = True
 WITH_BF_STATICOPENEXR = False
 BF_OPENEXR = LIBDIR + '/gcc/openexr'
@@ -77,11 +74,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include'
 BF_GETTEXT_LIB = 'gnu_gettext'
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
-WITH_BF_FTGL = True
-BF_FTGL = LIBDIR + '/ftgl'
-BF_FTGL_INC = '${BF_FTGL}/include'
-BF_FTGL_LIB = 'extern_ftgl'
-
 WITH_BF_GAMEENGINE = False
 
 WITH_BF_ODE = True
index 8fc334874f98eb553b0f18143660912367a7023c..6a7518a79287c1bd930de7b97883edddbf579b5b 100644 (file)
@@ -22,9 +22,6 @@ BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
 BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 
-WITH_BF_FMOD = False
-BF_FMOD = LIBDIR + '/fmod'
-
 WITH_BF_OPENEXR = False
 WITH_BF_STATICOPENEXR = False
 BF_OPENEXR = '/usr/local'
@@ -62,11 +59,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include'
 BF_GETTEXT_LIB = 'intl iconv'
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
-WITH_BF_FTGL = True
-BF_FTGL = '#extern/bFTGL'
-BF_FTGL_INC = '${BF_FTGL}/include'
-BF_FTGL_LIB = 'extern_ftgl'
-
 WITH_BF_GAMEENGINE=False
 
 WITH_BF_ODE = False
index dda7d0ff2f391305168e015767abba01d88c587c..25f200fe346d86e93b9b06517445ad8207a12d42 100644 (file)
@@ -28,9 +28,6 @@ BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
 
-WITH_BF_FMOD = False
-BF_FMOD = LIBDIR + '/fmod'
-
 WITH_BF_OPENEXR = True
 WITH_BF_STATICOPENEXR = False
 BF_OPENEXR = '/usr/local'
@@ -70,11 +67,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include'
 BF_GETTEXT_LIB = 'gettextlib'
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
-WITH_BF_FTGL = True
-BF_FTGL = '#extern/bFTGL'
-BF_FTGL_INC = '${BF_FTGL}/include'
-BF_FTGL_LIB = 'extern_ftgl'
-
 WITH_BF_GAMEENGINE=False
 
 WITH_BF_ODE = False
index 0ad93c3d38cb3d4a9d573076146406197a2a8123..a579d21a54471d52f5f30f6e259474f7a89eb55e 100644 (file)
@@ -35,9 +35,6 @@ BF_PTHREADS_INC = '${BF_PTHREADS}/include'
 BF_PTHREADS_LIB = 'pthreadGC2'
 BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
 
-WITH_BF_FMOD = False
-BF_FMOD = LIBDIR + '/fmod'
-
 WITH_BF_OPENEXR = True
 WITH_BF_STATICOPENEXR = False
 BF_OPENEXR = LIBDIR + '/gcc/openexr'
@@ -78,11 +75,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include'
 BF_GETTEXT_LIB = 'gnu_gettext'
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
-WITH_BF_FTGL = True
-BF_FTGL = LIBDIR + '/ftgl'
-BF_FTGL_INC = '${BF_FTGL}/include'
-BF_FTGL_LIB = 'extern_ftgl'
-
 WITH_BF_GAMEENGINE = False
 
 WITH_BF_ODE = True
index 22877bb93dc035b561746aab857d31cd60f24a8b..0717cdb6c8fe58f2af941cd5a0416bf9ed4d1b59 100644 (file)
@@ -6,7 +6,7 @@ WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
 BF_FFMPEG = LIBDIR +'/ffmpeg'
 BF_FFMPEG_INC = '${BF_FFMPEG}/include'
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB = 'avformat-52.lib avcodec-51.lib avdevice-52.lib avutil-49.lib swscale-0.lib'
+BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib swscale-0.lib'
 
 BF_PYTHON = LIBDIR + '/python'
 BF_PYTHON_VERSION = '2.5'
@@ -46,9 +46,6 @@ BF_PTHREADS_INC = '${BF_PTHREADS}/include'
 BF_PTHREADS_LIB = 'pthreadVC2'
 BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
 
-WITH_BF_FMOD = False
-BF_FMOD = LIBDIR + '/fmod'
-
 WITH_BF_OPENEXR = True
 WITH_BF_STATICOPENEXR = False
 BF_OPENEXR = LIBDIR + '/openexr'
@@ -90,11 +87,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include'
 BF_GETTEXT_LIB = 'gnu_gettext'
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
-WITH_BF_FTGL = True
-BF_FTGL = LIBDIR + '/ftgl'
-BF_FTGL_INC = '${BF_FTGL}/include'
-BF_FTGL_LIB = 'extern_ftgl'
-
 WITH_BF_GAMEENGINE = True
 WITH_BF_PLAYER = True
 
index 222c6c55b22b761d53a2f0a8347838a05a5c7072..945efecdc3c784d422ac83fbe53dee359db7ab26 100644 (file)
@@ -9,10 +9,10 @@ BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
 BF_FFMPEG_LIB = 'avformat-52.lib avcodec-51.lib avdevice-52.lib avutil-49.lib swscale-0.lib'
 
 BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '2.5'
+BF_PYTHON_VERSION = '3.0'
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
 BF_PYTHON_BINARY = 'python'
-BF_PYTHON_LIB = 'python25'
+BF_PYTHON_LIB = 'python30'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 
 WITH_BF_OPENAL = False 
@@ -87,14 +87,9 @@ WITH_BF_INTERNATIONAL = False
 
 BF_GETTEXT = LIBDIR + '/gettext'
 BF_GETTEXT_INC = '${BF_GETTEXT}/include'
-BF_GETTEXT_LIB = 'gnu_gettext'
+BF_GETTEXT_LIB = 'gettext'
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
-WITH_BF_FTGL = False
-BF_FTGL = LIBDIR + '/ftgl'
-BF_FTGL_INC = '${BF_FTGL}/include'
-BF_FTGL_LIB = 'extern_ftgl'
-
 WITH_BF_GAMEENGINE = True
 WITH_BF_PLAYER = False
 
index b81efb52de901d06ee2b68f92e96940e6f1c79f5..45778e235cd7f06522a3b2b812ad0ec6366d035d 100644 (file)
@@ -32,14 +32,6 @@ IF(WITH_BULLET)
   SUBDIRS(bullet2)
 ENDIF(WITH_BULLET)
 
-IF(WITH_INTERNATIONAL)
-  SUBDIRS(bFTGL)
-ENDIF(WITH_INTERNATIONAL)
-
-IF(WITH_VERSE)
-  SUBDIRS(verse)
-ENDIF(WITH_VERSE)
-
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
   SUBDIRS(binreloc)
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
index 38bec4b73dd0d649ba4b734322abc919af1ff050..582d158b66f94310b8a2301e88d46f0515ff45d4 100644 (file)
@@ -32,10 +32,6 @@ SOURCEDIR = extern
 DIR = $(OCGDIR)/extern
 DIRS = qhull/src solid glew/src
 
-ifeq ($(WITH_FREETYPE2), true)
-    DIRS += bFTGL/src
-endif
-
 ifeq ($(WITH_FFMPEG), true)
 ifeq ($(NAN_FFMPEG), $(LCGDIR)/ffmpeg)
     DIRS += ffmpeg
@@ -45,10 +41,6 @@ ifeq ($(NAN_FFMPEG), $(LCGDIR)/gcc/ffmpeg)
 endif
 endif
 
-ifeq ($(WITH_VERSE), true)
-   DIRS += verse
-endif
-
 ifneq ($(NAN_NO_KETSJI), true)
     DIRS += bullet2
 endif
index 716aee8991f336be67f343feaf0c53fa992e9412..126f40b00b36c1b501aeba1bee5aeafc46911db8 100644 (file)
@@ -11,9 +11,6 @@ if env['WITH_BF_GAMEENGINE']:
 if env['WITH_BF_BULLET']:
     SConscript(['bullet2/src/SConscript'])
 
-if env['WITH_BF_INTERNATIONAL']:
-    SConscript(['bFTGL/SConscript'])
-
 if env['WITH_BF_FFMPEG'] and env['BF_FFMPEG_LIB'] == '':
     SConscript(['x264/SConscript'])
     SConscript(['libmp3lame/SConscript'])
diff --git a/extern/bFTGL/CMakeLists.txt b/extern/bFTGL/CMakeLists.txt
deleted file mode 100644 (file)
index 529dc74..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id$
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# The Original Code is Copyright (C) 2006, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Jacques Beaurain.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-SET(INC include src ${FREETYPE_INC})
-
-FILE(GLOB SRC src/*.cpp)
-ADD_DEFINITIONS(-DFTGL_LIBRARY_STATIC)
-BLENDERLIB(extern_ftgl "${SRC}" "${INC}")
-#, libtype=['international','player'], priority=[5, 210])
diff --git a/extern/bFTGL/COPYING.txt b/extern/bFTGL/COPYING.txt
deleted file mode 100644 (file)
index 92b8903..0000000
+++ /dev/null
@@ -1,481 +0,0 @@
-                 GNU LIBRARY GENERAL PUBLIC LICENSE
-                      Version 2, June 1991
-
- Copyright (C) 1991 Free Software Foundation, Inc.
-                   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the library GPL.  It is
- numbered 2 because it goes with version 2 of the ordinary GPL.]
-
-                           Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it.  You can use it for
-your libraries, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library.  If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
-\f
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software.  To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-  Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs.  This
-license, the GNU Library General Public License, applies to certain
-designated libraries.  This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
-  The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it.  Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program.  However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
-  Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries.  We
-concluded that weaker conditions might promote sharing better.
-
-  However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves.  This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them.  (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.)  The hope is that this
-will lead to faster development of free libraries.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, while the latter only
-works together with the library.
-
-  Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
-\f
-                 GNU LIBRARY GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License").  Each licensee is
-addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-\f
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-\f
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-\f
-  6. As an exception to the Sections above, you may also compile or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    c) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    d) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-\f
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-\f
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Library General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-\f
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                           NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                    END OF TERMS AND CONDITIONS
-\f
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/extern/bFTGL/README.txt b/extern/bFTGL/README.txt
deleted file mode 100644 (file)
index a679d86..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-FTGL 2.0.11
-16 August 2004
-
-DESCRIPTION:
-
-FTGL is a free open source library to enable developers to use arbitrary
-fonts in their OpenGL (www.opengl.org)  applications.
-Unlike other OpenGL font libraries FTGL uses standard font file formats
-so doesn't need a preprocessing step to convert the high quality font data
-into a lesser quality, proprietary format.
-FTGL uses the Freetype (www.freetype.org) font library to open and 'decode'
-the fonts. It then takes that output and stores it in a format most efficient
-for OpenGL rendering.
-
-Rendering modes supported are
-- Bit maps
-- Antialiased Pix maps
-- Texture maps
-- Outlines
-- Polygon meshes
-- Extruded polygon meshes
-
-FTGL is designed to be used in commercial quality software. It has been
-written with performance, robustness and simplicity in mind.
-
-USAGE:
-
-       FTGLPixmapFont font( "Fonts:Arial");
-
-       font.FaceSize( 72);
-       
-       font.render( "Hello World!");
-
-This library was inspired by gltt, Copyright (C) 1998-1999 Stephane Rehel
-(http://gltt.sourceforge.net)
-Bezier curve code contributed by Jed Soane.
-Demo, Linux port, extrusion code and gltt maintainance by Gerard Lanois
-Linux port by Matthias Kretz
-Windows port by Andrew Ellerton & Max Rheiner
-Bug fixes by Robert Osfield, Marcelo E. Magallon, Markku Rontu, Mark A. Fox,
-Patrick Rogers
-Containers and optimisations by Sebastien Barre
-Autoconf Marcelo E. Magallon.
-
-
-Please contact me if you have any suggestions, feature requests, or problems.
-
-Henry Maddocks
-ftgl@opengl.geek.nz
-http://homepages.paradise.net.nz/henryj/
-
diff --git a/extern/bFTGL/SConscript b/extern/bFTGL/SConscript
deleted file mode 100644 (file)
index 03a17a6..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/python
-import sys
-import os
-
-Import('env')
-
-incs = 'include src ' + env['BF_FREETYPE_INC'] + ' ' + env['BF_OPENGL_INC']
-defs = ''
-
-sources = env.Glob('src/*.cpp')
-
-env.BlenderLib ( 'extern_ftgl', sources, Split(incs), Split(defs), libtype=['extern'], priority=[5])
diff --git a/extern/bFTGL/cleanup b/extern/bFTGL/cleanup
deleted file mode 100755 (executable)
index c6d24ed..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh -fx
-# script to get rid of the grabage that MAC OSX drops in all the directories
-
-find . -name .DS_Store -print -exec rm {} \;
diff --git a/extern/bFTGL/include/FTBBox.h b/extern/bFTGL/include/FTBBox.h
deleted file mode 100644 (file)
index 7ff5301..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-#ifndef     __FTBBox__
-#define     __FTBBox__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-//#include FT_GLYPH_H
-#include FT_OUTLINE_H
-
-#include "FTGL.h"
-#include "FTPoint.h"
-
-
-/**
- * FTBBox is a convenience class for handling bounding boxes.
- */
-class FTGL_EXPORT FTBBox
-{
-    public:
-        /**
-         * Default constructor. Bounding box is set to zero.
-         */
-        FTBBox()
-        :   lowerX(0.0f),
-            lowerY(0.0f),
-            lowerZ(0.0f),
-            upperX(0.0f),
-            upperY(0.0f),
-            upperZ(0.0f)
-        {}
-        
-        /**
-         * Constructor.
-         */
-        FTBBox( float lx, float ly, float lz, float ux, float uy, float uz)
-        :   lowerX(lx),
-            lowerY(ly),
-            lowerZ(lz),
-            upperX(ux),
-            upperY(uy),
-            upperZ(uz)
-        {}
-        
-        /**
-         * Constructor. Extracts a bounding box from a freetype glyph. Uses
-         * the control box for the glyph. <code>FT_Glyph_Get_CBox()</code>
-         *
-         * @param glyph A freetype glyph
-         */
-        FTBBox( FT_GlyphSlot glyph)
-        :   lowerX(0.0f),
-            lowerY(0.0f),
-            lowerZ(0.0f),
-            upperX(0.0f),
-            upperY(0.0f),
-            upperZ(0.0f)
-        {
-            FT_BBox bbox;
-            FT_Outline_Get_CBox( &(glyph->outline), &bbox);
-
-            lowerX = static_cast<float>( bbox.xMin) / 64.0f;
-            lowerY = static_cast<float>( bbox.yMin) / 64.0f;
-            lowerZ = 0.0f;
-            upperX = static_cast<float>( bbox.xMax) / 64.0f;
-            upperY = static_cast<float>( bbox.yMax) / 64.0f;
-            upperZ = 0.0f;
-            
-        }       
-
-        /**
-         * Destructor
-         */
-        ~FTBBox()
-        {}
-        
-
-        /**
-         * Move the Bounding Box by a vector.
-         *
-         * @param distance The distance to move the bbox in 3D space.
-         */
-        FTBBox& Move( FTPoint distance)
-        {
-            lowerX += distance.x;
-            lowerY += distance.y;
-            lowerZ += distance.z;
-            upperX += distance.x;
-            upperY += distance.y;
-            upperZ += distance.z;
-            return *this;
-        }
-
-        FTBBox& operator += ( const FTBBox& bbox) 
-        {
-            lowerX = bbox.lowerX < lowerX? bbox.lowerX: lowerX; 
-            lowerY = bbox.lowerY < lowerY? bbox.lowerY: lowerY;
-            lowerZ = bbox.lowerZ < lowerZ? bbox.lowerZ: lowerZ; 
-            upperX = bbox.upperX > upperX? bbox.upperX: upperX; 
-            upperY = bbox.upperY > upperY? bbox.upperY: upperY; 
-            upperZ = bbox.upperZ > upperZ? bbox.upperZ: upperZ; 
-            
-            return *this;
-        }
-        
-        void SetDepth( float depth)
-        {
-            upperZ = lowerZ + depth;
-        }
-        
-        
-        /**
-         * The bounds of the box
-         */
-        // Make these ftPoints & private
-        float lowerX, lowerY, lowerZ, upperX, upperY, upperZ;
-    protected:
-    
-    
-    private:
-
-};
-
-
-#endif  //  __FTBBox__
-
diff --git a/extern/bFTGL/include/FTBitmapGlyph.h b/extern/bFTGL/include/FTBitmapGlyph.h
deleted file mode 100644 (file)
index 89154a9..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef     __FTBitmapGlyph__
-#define     __FTBitmapGlyph__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_GLYPH_H
-
-#include "FTGL.h"
-#include "FTGlyph.h"
-
-
-/**
- * FTBitmapGlyph is a specialisation of FTGlyph for creating bitmaps.
- *
- * It provides the interface between Freetype glyphs and their openGL
- * Renderable counterparts. This is an abstract class and derived classes
- * must implement the <code>Render</code> function. 
- * 
- * @see FTGlyphContainer
- *
- */
-class FTGL_EXPORT FTBitmapGlyph : public FTGlyph
-{
-    public:
-        /**
-         * Constructor
-         *
-         * @param glyph The Freetype glyph to be processed
-         */
-        FTBitmapGlyph( FT_GlyphSlot glyph);
-
-        /**
-         * Destructor
-         */
-        virtual ~FTBitmapGlyph();
-
-        /**
-         * Renders this glyph at the current pen position.
-         *
-         * @param pen   The current pen position.
-         * @return      The advance distance for this glyph.
-         */
-        virtual float Render( const FTPoint& pen);
-        
-    private:
-        /**
-         * The width of the glyph 'image'
-         */
-        unsigned int destWidth;
-
-        /**
-         * The height of the glyph 'image'
-         */
-        unsigned int destHeight;
-
-        /**
-         * The pitch of the glyph 'image'
-         */
-        unsigned int destPitch;
-
-        /**
-         * Vector from the pen position to the topleft corner of the bitmap
-         */
-        FTPoint pos;
-        
-        /**
-         * Pointer to the 'image' data
-         */
-        unsigned char* data;
-        
-};
-
-
-#endif  //  __FTBitmapGlyph__
-
diff --git a/extern/bFTGL/include/FTBufferGlyph.h b/extern/bFTGL/include/FTBufferGlyph.h
deleted file mode 100644 (file)
index 9795f4d..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef     __FTBufferGlyph__
-#define     __FTBufferGlyph__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_GLYPH_H
-
-#include "FTGL.h"
-#include "FTGlyph.h"
-
-
-/**
- * FTBufferGlyph is a specialisation of FTGlyph for creating pixmaps.
- * 
- * @see FTGlyphContainer
- *
- */
-class  FTGL_EXPORT FTBufferGlyph : public FTGlyph
-{
-    public:
-        /**
-         * Constructor
-         *
-         * @param glyph The Freetype glyph to be processed
-         */
-        FTBufferGlyph( FT_GlyphSlot glyph, unsigned char* clientBuffer);
-
-        /**
-         * Destructor
-         */
-        virtual ~FTBufferGlyph();
-
-        /**
-         * Renders this glyph at the current pen position.
-         *
-         * @param pen   The current pen position.
-         * @return      The advance distance for this glyph.
-         */
-        virtual float Render( const FTPoint& pen);
-        
-        // attributes
-
-    private:
-        /**
-         * The width of the glyph 'image'
-         */
-        int destWidth;
-
-        /**
-         * The height of the glyph 'image'
-         */
-        int destHeight;
-
-        /**
-         * The pitch of the glyph 'image'
-         */
-        unsigned int destPitch;
-        
-        /**
-         * Vector from the pen position to the topleft corner of the pixmap
-         */
-        FTPoint pos;
-        
-        /**
-         * Pointer to the 'image' data
-         */
-        unsigned char* data;
-        
-        
-        unsigned char* buffer;
-        
-};
-
-
-#endif  //  __FTBufferGlyph__
diff --git a/extern/bFTGL/include/FTCharToGlyphIndexMap.h b/extern/bFTGL/include/FTCharToGlyphIndexMap.h
deleted file mode 100644 (file)
index 6e40d3c..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-#ifndef    __FTCharToGlyphIndexMap__
-#define    __FTCharToGlyphIndexMap__
-
-#include <stdlib.h>
-
-#include "FTGL.h"
-
-/**
- * Provides a non-STL alternative to the STL map<unsigned long, unsigned long>
- * which maps character codes to glyph indices inside FTCharmap.
- * 
- * Implementation:
- *   - NumberOfBuckets buckets are considered.
- *   - Each bucket has BucketSize entries.
- *   - When the glyph index for the character code C has to be stored, the 
- *     bucket this character belongs to is found using 'C div BucketSize'. 
- *     If this bucket has not been allocated yet, do it now.
- *     The entry in the bucked is found using 'C mod BucketSize'. 
- *     If it is set to IndexNotFound, then the glyph entry has not been set.
- *   - Try to mimic the calls made to the STL map API.
- *
- * Caveats:
- *   - The glyph index is now a signed long instead of unsigned long, so
- *     the special value IndexNotFound (= -1) can be used to specify that the 
- *     glyph index has not been stored yet.
- */
-class FTGL_EXPORT FTCharToGlyphIndexMap
-{
-    public:
-  
-        typedef unsigned long CharacterCode;
-        typedef signed long GlyphIndex;
-        
-        enum 
-        {
-            NumberOfBuckets = 256,
-            BucketSize = 256,
-            IndexNotFound = -1
-        };
-
-        FTCharToGlyphIndexMap()
-        {
-            this->Indices = 0;
-        }
-
-        virtual ~FTCharToGlyphIndexMap()
-        {
-            if( this->Indices)
-            {
-                // Free all buckets
-                this->clear();
-        
-                // Free main structure
-                delete [] this->Indices;
-                this->Indices = 0;
-            }
-        }
-  
-        void clear()
-        {
-            if(this->Indices)
-            {
-                for( int i = 0; i < FTCharToGlyphIndexMap::NumberOfBuckets; i++)
-                {
-                    if( this->Indices[i])
-                    {
-                        delete [] this->Indices[i];
-                        this->Indices[i] = 0;
-                    }
-                }
-            }
-        }
-
-        const GlyphIndex find( CharacterCode c)
-        {
-            if( !this->Indices)
-            {
-                return 0;
-            }
-        
-            // Find position of char code in buckets
-            div_t pos = div( c, FTCharToGlyphIndexMap::BucketSize);
-        
-            if( !this->Indices[pos.quot])
-            {
-                return 0;
-            }
-        
-            const FTCharToGlyphIndexMap::GlyphIndex *ptr = &this->Indices[pos.quot][pos.rem];
-            if( *ptr == FTCharToGlyphIndexMap::IndexNotFound)
-            {
-                return 0;
-            }
-        
-            return *ptr;
-        }
-
-        void insert( CharacterCode c, GlyphIndex g)
-        {
-            if( !this->Indices)
-            {
-                this->Indices = new GlyphIndex* [FTCharToGlyphIndexMap::NumberOfBuckets];
-                for( int i = 0; i < FTCharToGlyphIndexMap::NumberOfBuckets; i++)
-                {
-                    this->Indices[i] = 0;
-                }
-            }
-        
-            // Find position of char code in buckets
-            div_t pos = div(c, FTCharToGlyphIndexMap::BucketSize);
-        
-            // Allocate bucket if does not exist yet
-            if( !this->Indices[pos.quot])
-            {
-                this->Indices[pos.quot] = new GlyphIndex [FTCharToGlyphIndexMap::BucketSize];
-                for( int i = 0; i < FTCharToGlyphIndexMap::BucketSize; i++)
-                {
-                    this->Indices[pos.quot][i] = FTCharToGlyphIndexMap::IndexNotFound;
-                }
-            }
-          
-            this->Indices[pos.quot][pos.rem] = g;
-        }
-  
-    private:
-        GlyphIndex** Indices;
-};
-
-
-#endif  //  __FTCharToGlyphIndexMap__
diff --git a/extern/bFTGL/include/FTCharmap.h b/extern/bFTGL/include/FTCharmap.h
deleted file mode 100644 (file)
index 74ca6f2..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-#ifndef     __FTCharmap__
-#define     __FTCharmap__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_GLYPH_H
-
-#include "FTCharToGlyphIndexMap.h"
-
-#include "FTGL.h"
-
-
-/**
- * FTCharmap takes care of specifying the encoding for a font and mapping
- * character codes to glyph indices.
- *
- * It doesn't preprocess all indices, only on an as needed basis. This may
- * seem like a performance penalty but it is quicker than using the 'raw'
- * freetype calls and will save significant amounts of memory when dealing
- * with unicode encoding
- *
- * @see "Freetype 2 Documentation" 
- *
- */
-
-class FTFace;
-
-class FTGL_EXPORT FTCharmap
-{
-    public:
-        /**
-         * Constructor
-         */
-        FTCharmap( FTFace* face);
-
-        /**
-         * Destructor
-         */
-        virtual ~FTCharmap();
-
-        /**
-         * Queries for the current character map code.
-         *
-         * @return  The current character map code.
-         */
-        FT_Encoding Encoding() const { return ftEncoding;}
-        
-        /**
-         * Sets the character map for the face.
-         * Valid encodings as at Freetype 2.0.4
-         *      ft_encoding_none
-         *      ft_encoding_symbol
-         *      ft_encoding_unicode
-         *      ft_encoding_latin_2
-         *      ft_encoding_sjis
-         *      ft_encoding_gb2312
-         *      ft_encoding_big5
-         *      ft_encoding_wansung
-         *      ft_encoding_johab
-         *      ft_encoding_adobe_standard
-         *      ft_encoding_adobe_expert
-         *      ft_encoding_adobe_custom
-         *      ft_encoding_apple_roman
-         *
-         * @param encoding  the Freetype encoding symbol. See above.
-         * @return          <code>true</code> if charmap was valid and set
-         *                  correctly. If the requested encoding is
-         *                  unavailable it will be set to ft_encoding_none.
-         */
-        bool CharMap( FT_Encoding encoding);
-        
-        /**
-         * Get the FTGlyphContainer index of the input character.
-         *
-         * @param characterCode The character code of the requested glyph in
-         *                      the current encoding eg apple roman.
-         * @return      The FTGlyphContainer index for the character or zero
-         *              if it wasn't found
-         */
-        unsigned int GlyphListIndex( const unsigned int characterCode);
-
-        /**
-         * Get the font glyph index of the input character.
-         *
-         * @param characterCode The character code of the requested glyph in
-         *                      the current encoding eg apple roman.
-         * @return      The glyph index for the character.
-         */
-        unsigned int FontIndex( const unsigned int characterCode);
-
-        /**
-         * Set the FTGlyphContainer index of the character code.
-         *
-         * @param characterCode  The character code of the requested glyph in
-         *                       the current encoding eg apple roman.
-         * @param containerIndex The index into the FTGlyphContainer of the
-         *                       character code.
-         */
-        void InsertIndex( const unsigned int characterCode, const unsigned int containerIndex);
-
-        /**
-         * Queries for errors.
-         *
-         * @return  The current error code. Zero means no error.
-         */
-        FT_Error Error() const { return err;}
-        
-    private:
-        /**
-         * Current character map code.
-         */
-        FT_Encoding ftEncoding;
-        
-        /**
-         * The current Freetype face.
-         */
-        const FT_Face ftFace;
-        
-        /**
-         * A structure that maps glyph indices to character codes
-         *
-         * < character code, face glyph index>
-         */
-        typedef FTCharToGlyphIndexMap CharacterMap;
-        CharacterMap charMap;
-        
-        /**
-         * Current error code.
-         */
-        FT_Error err;
-        
-};
-
-
-#endif  //  __FTCharmap__
diff --git a/extern/bFTGL/include/FTContour.h b/extern/bFTGL/include/FTContour.h
deleted file mode 100644 (file)
index 895d9ed..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-#ifndef     __FTContour__
-#define     __FTContour__
-
-#include "FTPoint.h"
-#include "FTVector.h"
-#include "FTGL.h"
-
-
-/**
- * FTContour class is a container of points that describe a vector font
- * outline. It is used as a container for the output of the bezier curve
- * evaluator in FTVectoriser.
- *
- * @see FTOutlineGlyph
- * @see FTPolyGlyph
- * @see FTPoint
- */
-class FTGL_EXPORT FTContour
-{
-    public:
-        /**
-         * Constructor
-         *
-         * @param contour
-         * @param pointTags
-         * @param numberOfPoints
-         */
-        FTContour( FT_Vector* contour, char* pointTags, unsigned int numberOfPoints);
-
-        /**
-         * Destructor
-         */
-        ~FTContour()
-        {
-            pointList.clear();
-