[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17611] branches/soc-2007-joeedh: merge part 1
Joseph Eagar
joeedh at gmail.com
Sat Nov 29 08:00:25 CET 2008
Revision: 17611
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17611
Author: joeedh
Date: 2008-11-29 08:00:10 +0100 (Sat, 29 Nov 2008)
Log Message:
-----------
merge part 1
Modified Paths:
--------------
branches/soc-2007-joeedh/CMakeLists.txt
branches/soc-2007-joeedh/SConstruct
branches/soc-2007-joeedh/bin/.blender/.Blanguages
branches/soc-2007-joeedh/config/linux2-config.py
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
branches/soc-2007-joeedh/intern/boolop/SConscript
branches/soc-2007-joeedh/intern/boolop/intern/BOP_Edge.cpp
branches/soc-2007-joeedh/intern/boolop/intern/BOP_Edge.h
branches/soc-2007-joeedh/intern/boolop/intern/BOP_Face.cpp
branches/soc-2007-joeedh/intern/boolop/intern/BOP_Face.h
branches/soc-2007-joeedh/intern/boolop/intern/BOP_Interface.cpp
branches/soc-2007-joeedh/intern/boolop/intern/BOP_Merge.cpp
branches/soc-2007-joeedh/intern/boolop/intern/BOP_Merge.h
branches/soc-2007-joeedh/intern/boolop/intern/BOP_Mesh.cpp
branches/soc-2007-joeedh/intern/boolop/intern/BOP_Mesh.h
branches/soc-2007-joeedh/intern/boolop/intern/BOP_Tag.h
branches/soc-2007-joeedh/intern/boolop/intern/BOP_Vertex.cpp
branches/soc-2007-joeedh/intern/boolop/intern/BOP_Vertex.h
branches/soc-2007-joeedh/intern/boolop/make/msvc_7_0/boolop.vcproj
branches/soc-2007-joeedh/intern/bsp/SConscript
branches/soc-2007-joeedh/intern/guardedalloc/intern/mallocn.c
branches/soc-2007-joeedh/intern/guardedalloc/intern/mmap_win.c
branches/soc-2007-joeedh/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj
branches/soc-2007-joeedh/intern/guardedalloc/mmap_win.h
branches/soc-2007-joeedh/intern/opennl/make/msvc_7_0/opennl.vcproj
branches/soc-2007-joeedh/intern/opennl/superlu/smemory.c
branches/soc-2007-joeedh/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
branches/soc-2007-joeedh/projectfiles_vc7/blender/blender.sln
branches/soc-2007-joeedh/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
branches/soc-2007-joeedh/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj
branches/soc-2007-joeedh/projectfiles_vc7/blender/src/BL_src.vcproj
branches/soc-2007-joeedh/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj
branches/soc-2007-joeedh/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
branches/soc-2007-joeedh/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
branches/soc-2007-joeedh/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
branches/soc-2007-joeedh/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj
branches/soc-2007-joeedh/projectfiles_vc7/kernel/system/SYS_system.vcproj
branches/soc-2007-joeedh/release/VERSION
branches/soc-2007-joeedh/release/datafiles/datatoc.c
branches/soc-2007-joeedh/release/datafiles/splash.jpg
branches/soc-2007-joeedh/release/scripts/bpymodules/colladaImEx/collada.py
branches/soc-2007-joeedh/release/scripts/bpymodules/colladaImEx/cstartup.py
branches/soc-2007-joeedh/release/scripts/bpymodules/colladaImEx/helperObjects.py
branches/soc-2007-joeedh/release/scripts/bpymodules/colladaImEx/translator.py
branches/soc-2007-joeedh/release/scripts/bpymodules/colladaImEx/xmlUtils.py
branches/soc-2007-joeedh/release/scripts/flt_export.py
branches/soc-2007-joeedh/release/scripts/flt_palettemanager.py
branches/soc-2007-joeedh/release/scripts/flt_properties.py
branches/soc-2007-joeedh/release/scripts/import_dxf.py
branches/soc-2007-joeedh/release/scripts/ply_export.py
branches/soc-2007-joeedh/release/scripts/rvk1_torvk2.py
branches/soc-2007-joeedh/release/scripts/weightpaint_clean.py
branches/soc-2007-joeedh/release/text/copyright.txt
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_blender.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_collision.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_customdata.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_deform.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_effect.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_endian.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_global.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_idprop.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_texture.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2007-joeedh/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/anim.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/cloth.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/collision.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/constraint.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/customdata.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/deform.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/displist.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/effect.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/icons.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/idprop.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/image.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/implicit.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/ipo.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/lattice.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/modifier.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/particle.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/particle_system.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/sca.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/scene.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/softbody.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/texture.c
branches/soc-2007-joeedh/source/blender/blenlib/BLI_editVert.h
branches/soc-2007-joeedh/source/blender/blenlib/BLI_kdopbvh.h
branches/soc-2007-joeedh/source/blender/blenlib/BLI_rand.h
branches/soc-2007-joeedh/source/blender/blenlib/BLI_winstuff.h
branches/soc-2007-joeedh/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2007-joeedh/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2007-joeedh/source/blender/blenlib/intern/arithb.c
branches/soc-2007-joeedh/source/blender/blenlib/intern/boxpack2d.c
branches/soc-2007-joeedh/source/blender/blenlib/intern/fileops.c
branches/soc-2007-joeedh/source/blender/blenlib/intern/freetypefont.c
branches/soc-2007-joeedh/source/blender/blenlib/intern/psfont.c
branches/soc-2007-joeedh/source/blender/blenlib/intern/rand.c
branches/soc-2007-joeedh/source/blender/blenlib/intern/util.c
branches/soc-2007-joeedh/source/blender/blenloader/BLO_sys_types.h
branches/soc-2007-joeedh/source/blender/blenloader/intern/genfile.c
branches/soc-2007-joeedh/source/blender/blenloader/intern/readblenentry.c
branches/soc-2007-joeedh/source/blender/blenloader/intern/readfile.c
branches/soc-2007-joeedh/source/blender/blenloader/intern/writefile.c
branches/soc-2007-joeedh/source/blender/blenpluginapi/intern/pluginapi.c
branches/soc-2007-joeedh/source/blender/imbuf/intern/anim.c
branches/soc-2007-joeedh/source/blender/imbuf/intern/cineon/cineonlib.c
branches/soc-2007-joeedh/source/blender/imbuf/intern/cineon/dpxlib.c
branches/soc-2007-joeedh/source/blender/imbuf/intern/cineon/logImageCore.h
branches/soc-2007-joeedh/source/blender/imbuf/intern/cineon/logmemfile.c
branches/soc-2007-joeedh/source/blender/imbuf/intern/cineon/logmemfile.h
branches/soc-2007-joeedh/source/blender/imbuf/intern/scaling.c
branches/soc-2007-joeedh/source/blender/include/BDR_drawaction.h
branches/soc-2007-joeedh/source/blender/include/BIF_editaction.h
branches/soc-2007-joeedh/source/blender/include/BIF_editarmature.h
branches/soc-2007-joeedh/source/blender/include/BIF_editmesh.h
branches/soc-2007-joeedh/source/blender/include/BIF_editview.h
branches/soc-2007-joeedh/source/blender/include/BIF_meshtools.h
branches/soc-2007-joeedh/source/blender/include/BIF_poseobject.h
branches/soc-2007-joeedh/source/blender/include/BIF_resources.h
branches/soc-2007-joeedh/source/blender/include/BIF_space.h
branches/soc-2007-joeedh/source/blender/include/BSE_drawview.h
branches/soc-2007-joeedh/source/blender/include/BSE_editaction_types.h
branches/soc-2007-joeedh/source/blender/include/butspace.h
branches/soc-2007-joeedh/source/blender/include/transform.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_ID.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_action_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_armature_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_customdata_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_ipo_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_object_force.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_object_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_particle_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_sensor_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_space_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2007-joeedh/source/blender/makesdna/intern/makesdna.c
branches/soc-2007-joeedh/source/blender/nodes/intern/SHD_nodes/SHD_material.c
branches/soc-2007-joeedh/source/blender/nodes/intern/SHD_util.c
branches/soc-2007-joeedh/source/blender/nodes/intern/SHD_util.h
branches/soc-2007-joeedh/source/blender/python/BPY_interface.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Armature.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Blender.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Bone.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Constraint.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Draw.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/IDProp.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Library.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Material.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Mathutils.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Mathutils.h
branches/soc-2007-joeedh/source/blender/python/api2_2x/Mesh.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Object.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Particle.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Text3d.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Texture.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Armature.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/IDProp.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Ipo.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/LibData.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Material.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Mathutils.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Object.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Particle.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Render.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Text3d.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Texture.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/sceneRender.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/vector.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/vector.h
branches/soc-2007-joeedh/source/blender/radiosity/CMakeLists.txt
branches/soc-2007-joeedh/source/blender/radiosity/SConscript
branches/soc-2007-joeedh/source/blender/radiosity/intern/source/Makefile
branches/soc-2007-joeedh/source/blender/radiosity/intern/source/radnode.c
branches/soc-2007-joeedh/source/blender/radiosity/intern/source/radpreprocess.c
branches/soc-2007-joeedh/source/blender/render/CMakeLists.txt
branches/soc-2007-joeedh/source/blender/render/SConscript
branches/soc-2007-joeedh/source/blender/render/intern/include/render_types.h
branches/soc-2007-joeedh/source/blender/render/intern/include/strand.h
branches/soc-2007-joeedh/source/blender/render/intern/include/zbuf.h
branches/soc-2007-joeedh/source/blender/render/intern/source/convertblender.c
branches/soc-2007-joeedh/source/blender/render/intern/source/occlusion.c
branches/soc-2007-joeedh/source/blender/render/intern/source/pipeline.c
branches/soc-2007-joeedh/source/blender/render/intern/source/rayshade.c
branches/soc-2007-joeedh/source/blender/render/intern/source/rendercore.c
branches/soc-2007-joeedh/source/blender/render/intern/source/shadbuf.c
branches/soc-2007-joeedh/source/blender/render/intern/source/shadeoutput.c
branches/soc-2007-joeedh/source/blender/render/intern/source/strand.c
branches/soc-2007-joeedh/source/blender/render/intern/source/zbuf.c
branches/soc-2007-joeedh/source/blender/render/intern/source/zbuf_abuf.c
branches/soc-2007-joeedh/source/blender/render/intern/source/zbuf_dsm.c
branches/soc-2007-joeedh/source/blender/render/intern/source/zbuf_shade.c
branches/soc-2007-joeedh/source/blender/render/intern/source/zbuf_shadow.c
branches/soc-2007-joeedh/source/blender/render/intern/source/zbuf_solid.c
branches/soc-2007-joeedh/source/blender/render/intern/source/zbuf_sss.c
branches/soc-2007-joeedh/source/blender/src/buttons_editing.c
branches/soc-2007-joeedh/source/blender/src/buttons_logic.c
branches/soc-2007-joeedh/source/blender/src/buttons_object.c
branches/soc-2007-joeedh/source/blender/src/buttons_scene.c
branches/soc-2007-joeedh/source/blender/src/drawaction.c
branches/soc-2007-joeedh/source/blender/src/drawipo.c
branches/soc-2007-joeedh/source/blender/src/drawmesh.c
branches/soc-2007-joeedh/source/blender/src/drawnode.c
branches/soc-2007-joeedh/source/blender/src/drawobject.c
branches/soc-2007-joeedh/source/blender/src/drawseq.c
branches/soc-2007-joeedh/source/blender/src/drawview.c
branches/soc-2007-joeedh/source/blender/src/editaction.c
branches/soc-2007-joeedh/source/blender/src/editarmature.c
branches/soc-2007-joeedh/source/blender/src/editimasel.c
branches/soc-2007-joeedh/source/blender/src/editipo.c
branches/soc-2007-joeedh/source/blender/src/editipo_lib.c
branches/soc-2007-joeedh/source/blender/src/editkey.c
branches/soc-2007-joeedh/source/blender/src/editmesh_mods.c
branches/soc-2007-joeedh/source/blender/src/editmesh_tools.c
branches/soc-2007-joeedh/source/blender/src/editnode.c
branches/soc-2007-joeedh/source/blender/src/editobject.c
branches/soc-2007-joeedh/source/blender/src/editseq.c
branches/soc-2007-joeedh/source/blender/src/editview.c
branches/soc-2007-joeedh/source/blender/src/header_action.c
branches/soc-2007-joeedh/source/blender/src/header_info.c
branches/soc-2007-joeedh/source/blender/src/header_ipo.c
branches/soc-2007-joeedh/source/blender/src/header_node.c
branches/soc-2007-joeedh/source/blender/src/header_script.c
branches/soc-2007-joeedh/source/blender/src/header_seq.c
branches/soc-2007-joeedh/source/blender/src/header_view3d.c
branches/soc-2007-joeedh/source/blender/src/interface.c
branches/soc-2007-joeedh/source/blender/src/interface_draw.c
branches/soc-2007-joeedh/source/blender/src/meshlaplacian.c
branches/soc-2007-joeedh/source/blender/src/meshtools.c
branches/soc-2007-joeedh/source/blender/src/outliner.c
branches/soc-2007-joeedh/source/blender/src/parametrizer.c
branches/soc-2007-joeedh/source/blender/src/parametrizer.h
branches/soc-2007-joeedh/source/blender/src/parametrizer_intern.h
branches/soc-2007-joeedh/source/blender/src/poselib.c
branches/soc-2007-joeedh/source/blender/src/poseobject.c
branches/soc-2007-joeedh/source/blender/src/renderwin.c
branches/soc-2007-joeedh/source/blender/src/resources.c
branches/soc-2007-joeedh/source/blender/src/sequence.c
branches/soc-2007-joeedh/source/blender/src/space.c
branches/soc-2007-joeedh/source/blender/src/splash.jpg.c
branches/soc-2007-joeedh/source/blender/src/toolbox.c
branches/soc-2007-joeedh/source/blender/src/transform_conversions.c
branches/soc-2007-joeedh/source/blender/src/transform_generics.c
branches/soc-2007-joeedh/source/blender/src/transform_manipulator.c
branches/soc-2007-joeedh/source/blender/src/transform_numinput.c
branches/soc-2007-joeedh/source/blender/src/usiblender.c
branches/soc-2007-joeedh/source/blender/yafray/intern/export_Plugin.cpp
branches/soc-2007-joeedh/source/creator/creator.c
branches/soc-2007-joeedh/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2007-joeedh/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
branches/soc-2007-joeedh/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
branches/soc-2007-joeedh/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/soc-2007-joeedh/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2007-joeedh/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2007-joeedh/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2007-joeedh/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2007-joeedh/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/soc-2007-joeedh/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/soc-2007-joeedh/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2007-joeedh/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/soc-2007-joeedh/source/gameengine/Converter/KX_IpoConvert.cpp
branches/soc-2007-joeedh/source/gameengine/Converter/KX_IpoConvert.h
branches/soc-2007-joeedh/source/gameengine/Expressions/InputParser.cpp
branches/soc-2007-joeedh/source/gameengine/Expressions/ListValue.cpp
branches/soc-2007-joeedh/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2007-joeedh/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2007-joeedh/source/gameengine/Expressions/Value.cpp
branches/soc-2007-joeedh/source/gameengine/Expressions/Value.h
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_ActuatorSensor.h
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_AlwaysEventManager.cpp
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_EventManager.cpp
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_EventManager.h
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_IController.cpp
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_IObject.cpp
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_ISensor.h
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_JoystickManager.cpp
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_JoystickManager.h
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_KeyboardManager.cpp
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_KeyboardManager.h
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_LogicManager.cpp
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_LogicManager.h
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_MouseManager.cpp
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_MouseManager.h
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_PropertyEventManager.cpp
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_PropertyEventManager.h
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_PythonController.h
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_RandomEventManager.cpp
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_RandomEventManager.h
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_TimeEventManager.cpp
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_TimeEventManager.h
branches/soc-2007-joeedh/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
branches/soc-2007-joeedh/source/gameengine/GamePlayer/common/GPC_Canvas.h
branches/soc-2007-joeedh/source/gameengine/GamePlayer/common/windows/GPW_Canvas.h
branches/soc-2007-joeedh/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2007-joeedh/source/gameengine/GamePlayer/ghost/GPG_Application.h
branches/soc-2007-joeedh/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2007-joeedh/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/BL_BlenderShader.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/BL_Material.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2007-joeedh/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_BulletPhysicsController.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_CameraActuator.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_ConstraintActuator.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_IPhysicsController.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_IpoActuator.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_MaterialIpoController.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_MaterialIpoController.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_NearSensor.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_NearSensor.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_OdePhysicsController.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_OdePhysicsController.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_ParentActuator.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_ParentActuator.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_PyMath.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_PythonInit.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_RayEventManager.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_RayEventManager.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_SumoPhysicsController.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_TouchEventManager.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_TouchEventManager.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_TouchSensor.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_TouchSensor.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/SConscript
branches/soc-2007-joeedh/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.h
branches/soc-2007-joeedh/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/soc-2007-joeedh/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2007-joeedh/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2007-joeedh/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2007-joeedh/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/soc-2007-joeedh/source/gameengine/Physics/Bullet/SConscript
branches/soc-2007-joeedh/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
branches/soc-2007-joeedh/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Scene.cpp
branches/soc-2007-joeedh/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
branches/soc-2007-joeedh/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h
branches/soc-2007-joeedh/source/gameengine/Physics/common/PHY_DynamicTypes.h
branches/soc-2007-joeedh/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/soc-2007-joeedh/source/gameengine/PyDoc/GameLogic.py
branches/soc-2007-joeedh/source/gameengine/PyDoc/KX_CameraActuator.py
branches/soc-2007-joeedh/source/gameengine/PyDoc/KX_ConstraintActuator.py
branches/soc-2007-joeedh/source/gameengine/PyDoc/KX_GameObject.py
branches/soc-2007-joeedh/source/gameengine/PyDoc/KX_IpoActuator.py
branches/soc-2007-joeedh/source/gameengine/PyDoc/KX_ObjectActuator.py
branches/soc-2007-joeedh/source/gameengine/PyDoc/KX_ParentActuator.py
branches/soc-2007-joeedh/source/gameengine/PyDoc/KX_SCA_AddObjectActuator.py
branches/soc-2007-joeedh/source/gameengine/PyDoc/KX_TrackToActuator.py
branches/soc-2007-joeedh/source/gameengine/PyDoc/SCA_ISensor.py
branches/soc-2007-joeedh/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/soc-2007-joeedh/source/gameengine/Rasterizer/RAS_2DFilterManager.h
branches/soc-2007-joeedh/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/soc-2007-joeedh/source/gameengine/Rasterizer/RAS_BucketManager.h
branches/soc-2007-joeedh/source/gameengine/Rasterizer/RAS_CameraData.h
branches/soc-2007-joeedh/source/gameengine/Rasterizer/RAS_ICanvas.h
branches/soc-2007-joeedh/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
branches/soc-2007-joeedh/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/soc-2007-joeedh/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/soc-2007-joeedh/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
branches/soc-2007-joeedh/source/gameengine/Rasterizer/RAS_MaterialBucket.h
branches/soc-2007-joeedh/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/soc-2007-joeedh/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/soc-2007-joeedh/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2007-joeedh/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/soc-2007-joeedh/source/gameengine/Rasterizer/RAS_Polygon.cpp
branches/soc-2007-joeedh/source/kernel/CMakeLists.txt
branches/soc-2007-joeedh/source/kernel/SConscript
branches/soc-2007-joeedh/source/kernel/gen_system/GEN_HashedPtr.cpp
branches/soc-2007-joeedh/source/kernel/gen_system/Makefile
branches/soc-2007-joeedh/source/nan_definitions.mk
branches/soc-2007-joeedh/tools/btools.py
Added Paths:
-----------
branches/soc-2007-joeedh/bin/.blender/locale/kr/
branches/soc-2007-joeedh/bin/.blender/locale/kr/LC_MESSAGES/
branches/soc-2007-joeedh/bin/.blender/locale/kr/LC_MESSAGES/blender.mo
branches/soc-2007-joeedh/intern/bmfont/intern/BDF2BMF.py
branches/soc-2007-joeedh/intern/boolop/intern/BOP_Merge2.cpp
branches/soc-2007-joeedh/intern/boolop/intern/BOP_Merge2.h
branches/soc-2007-joeedh/intern/boolop/intern/BOP_Misc.h
branches/soc-2007-joeedh/intern/guardedalloc/BLO_sys_types.h
branches/soc-2007-joeedh/intern/opennl/superlu/BLO_sys_types.h
branches/soc-2007-joeedh/po/kr.po
branches/soc-2007-joeedh/release/scripts/flt_dofedit.py
branches/soc-2007-joeedh/release/scripts/flt_lodedit.py
branches/soc-2007-joeedh/release/text/release_247.txt
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_bvhutils.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_shrinkwrap.h
branches/soc-2007-joeedh/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2007-joeedh/source/blender/include/BDR_gpencil.h
branches/soc-2007-joeedh/source/blender/include/BIF_drawgpencil.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_gpencil_types.h
branches/soc-2007-joeedh/source/blender/src/drawgpencil.c
branches/soc-2007-joeedh/source/blender/src/editaction_gpencil.c
branches/soc-2007-joeedh/source/blender/src/gpencil.c
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_DelaySensor.cpp
branches/soc-2007-joeedh/source/gameengine/GameLogic/SCA_DelaySensor.h
branches/soc-2007-joeedh/source/gameengine/PyDoc/BL_ShapeActionActuator.py
branches/soc-2007-joeedh/source/gameengine/PyDoc/KX_ActuatorSensor.py
branches/soc-2007-joeedh/source/gameengine/PyDoc/KX_StateActuator.py
branches/soc-2007-joeedh/source/gameengine/PyDoc/SCA_DelaySensor.py
Removed Paths:
-------------
branches/soc-2007-joeedh/bin/.blender/locale/kr/LC_MESSAGES/
branches/soc-2007-joeedh/bin/.blender/locale/kr/LC_MESSAGES/blender.mo
branches/soc-2007-joeedh/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.cpp
branches/soc-2007-joeedh/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.h
Modified: branches/soc-2007-joeedh/CMakeLists.txt
===================================================================
--- branches/soc-2007-joeedh/CMakeLists.txt 2008-11-29 04:46:31 UTC (rev 17610)
+++ branches/soc-2007-joeedh/CMakeLists.txt 2008-11-29 07:00:10 UTC (rev 17611)
@@ -63,7 +63,6 @@
OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
-OPTION(YESIAMSTUPID "Enable execution on 64-bit platforms" OFF)
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
@@ -183,9 +182,9 @@
SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++")
IF(WITH_OPENMP)
- SET(LLIBS "${LLIBS} -lgomp ")
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp ")
+ SET(LLIBS "${LLIBS} -lgomp")
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
ENDIF(WITH_OPENMP)
Modified: branches/soc-2007-joeedh/SConstruct
===================================================================
--- branches/soc-2007-joeedh/SConstruct 2008-11-29 04:46:31 UTC (rev 17610)
+++ branches/soc-2007-joeedh/SConstruct 2008-11-29 07:00:10 UTC (rev 17611)
@@ -184,15 +184,16 @@
env['CPPFLAGS'].append('/openmp')
env['CXXFLAGS'].append('/openmp')
else:
- if env['CC'] == 'icc':
+ if env['CC'][-3:] == 'icc': # to be able to handle CC=/opt/bla/icc case
env.Append(LINKFLAGS=['-openmp', '-static-intel'])
env['CCFLAGS'].append('-openmp')
env['CPPFLAGS'].append('-openmp')
env['CXXFLAGS'].append('-openmp')
else:
- env['CCFLAGS'].append('-fopenmp')
- env['CPPFLAGS'].append('-fopenmp')
- env['CXXFLAGS'].append('-fopenmp')
+ env.Append(CCFLAGS=['-fopenmp'])
+ env.Append(CPPFLAGS=['-fopenmp'])
+ env.Append(CXXFLAGS=['-fopenmp'])
+ # env.Append(LINKFLAGS=['-fprofile-generate'])
#check for additional debug libnames
Modified: branches/soc-2007-joeedh/bin/.blender/.Blanguages
===================================================================
--- branches/soc-2007-joeedh/bin/.blender/.Blanguages 2008-11-29 04:46:31 UTC (rev 17610)
+++ branches/soc-2007-joeedh/bin/.blender/.Blanguages 2008-11-29 07:00:10 UTC (rev 17611)
@@ -20,3 +20,4 @@
Arabic:ar
Bulgarian:bg
Greek:el
+Korean:kr
Copied: branches/soc-2007-joeedh/bin/.blender/locale/kr (from rev 16242, trunk/blender/bin/.blender/locale/kr)
Copied: branches/soc-2007-joeedh/bin/.blender/locale/kr/LC_MESSAGES (from rev 16242, trunk/blender/bin/.blender/locale/kr/LC_MESSAGES)
Deleted: branches/soc-2007-joeedh/bin/.blender/locale/kr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Copied: branches/soc-2007-joeedh/bin/.blender/locale/kr/LC_MESSAGES/blender.mo (from rev 16242, trunk/blender/bin/.blender/locale/kr/LC_MESSAGES/blender.mo)
===================================================================
(Binary files differ)
Modified: branches/soc-2007-joeedh/config/linux2-config.py
===================================================================
--- branches/soc-2007-joeedh/config/linux2-config.py 2008-11-29 04:46:31 UTC (rev 17610)
+++ branches/soc-2007-joeedh/config/linux2-config.py 2008-11-29 07:00:10 UTC (rev 17611)
@@ -139,7 +139,7 @@
BF_OPENJPEG_INC = '${BF_OPENJPEG}/include'
BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
-WITH_BF_REDCODE = 'true'
+WITH_BF_REDCODE = 'false'
BF_REDCODE = '#extern/libredcode'
BF_REDCODE_LIB = ''
# Uncomment the following two lines to use system's ffmpeg
Modified: branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
===================================================================
--- branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp 2008-11-29 04:46:31 UTC (rev 17610)
+++ branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp 2008-11-29 07:00:10 UTC (rev 17611)
@@ -856,10 +856,26 @@
btScalar radius = coneShape->getRadius();//+coneShape->getMargin();
btScalar height = coneShape->getHeight();//+coneShape->getMargin();
btVector3 start = worldTransform.getOrigin();
- getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(radius,btScalar(0.),btScalar(-0.5)*height),color);
- getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(-radius,btScalar(0.),btScalar(-0.5)*height),color);
- getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(btScalar(0.),radius,btScalar(-0.5)*height),color);
- getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(btScalar(0.),-radius,btScalar(-0.5)*height),color);
+ // insert here Bullet 2.69 that fixes representation of cone
+ int upAxis= coneShape->getConeUpIndex();
+
+ btVector3 offsetHeight(0,0,0);
+ offsetHeight[upAxis] = height * btScalar(0.5);
+ btVector3 offsetRadius(0,0,0);
+ offsetRadius[(upAxis+1)%3] = radius;
+ btVector3 offset2Radius(0,0,0);
+ offset2Radius[(upAxis+2)%3] = radius;
+
+ getDebugDrawer()->drawLine(start+worldTransform.getBasis() * (offsetHeight),start+worldTransform.getBasis() * (-offsetHeight+offsetRadius),color);
+ getDebugDrawer()->drawLine(start+worldTransform.getBasis() * (offsetHeight),start+worldTransform.getBasis() * (-offsetHeight-offsetRadius),color);
+ getDebugDrawer()->drawLine(start+worldTransform.getBasis() * (offsetHeight),start+worldTransform.getBasis() * (-offsetHeight+offset2Radius),color);
+ getDebugDrawer()->drawLine(start+worldTransform.getBasis() * (offsetHeight),start+worldTransform.getBasis() * (-offsetHeight-offset2Radius),color);
+
+ // buggy code that does not take into account the direction of the cone
+ //getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(radius,btScalar(0.),btScalar(-0.5)*height),color);
+ //getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(-radius,btScalar(0.),btScalar(-0.5)*height),color);
+ //getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(btScalar(0.),radius,btScalar(-0.5)*height),color);
+ //getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(btScalar(0.),-radius,btScalar(-0.5)*height),color);
break;
}
Copied: branches/soc-2007-joeedh/intern/bmfont/intern/BDF2BMF.py (from rev 16242, trunk/blender/intern/bmfont/intern/BDF2BMF.py)
===================================================================
--- branches/soc-2007-joeedh/intern/bmfont/intern/BDF2BMF.py (rev 0)
+++ branches/soc-2007-joeedh/intern/bmfont/intern/BDF2BMF.py 2008-11-29 07:00:10 UTC (rev 17611)
@@ -0,0 +1,177 @@
+#!/usr/bin/python
+
+# ***** 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.
+#
+# ***** END GPL LICENCE BLOCK *****
+# --------------------------------------------------------------------------
+
+HELP_TXT = \
+'''
+Convert BDF pixmap fonts into C++ files Blender can read.
+Use to replace bitmap fonts or add new ones.
+
+Usage
+ python bdf2bmf.py -name=SomeName myfile.bdf
+
+Blender currently supports fonts with a maximum width of 8 pixels.
+'''
+
+# -------- Simple BDF parser
+import sys
+def parse_bdf(f, MAX_CHARS=256):
+ lines = [l.strip().upper().split() for l in f.readlines()]
+
+ is_bitmap = False
+ dummy = {'BITMAP':[]}
+ char_data = [dummy.copy() for i in xrange(MAX_CHARS)]
+ context_bitmap = []
+
+ for l in lines:
+ if l[0]=='ENCODING': enc = int(l[1])
+ elif l[0]=='BBX': bbx = [int(c) for c in l[1:]]
+ elif l[0]=='DWIDTH': dwidth = int(l[1])
+ elif l[0]=='BITMAP': is_bitmap = True
+ elif l[0]=='ENDCHAR':
+ if enc < MAX_CHARS:
+ char_data[enc]['BBX'] = bbx
+ char_data[enc]['DWIDTH'] = dwidth
+ char_data[enc]['BITMAP'] = context_bitmap
+
+ context_bitmap = []
+ enc = bbx = None
+ is_bitmap = False
+ else:
+ # None of the above, Ok, were reading a bitmap
+ if is_bitmap and enc < MAX_CHARS:
+ context_bitmap.append( int(l[0], 16) )
+
+ return char_data
+# -------- end simple BDF parser
+
+def bdf2cpp_name(path):
+ return path.split('.')[0] + '.cpp'
+
+def convert_to_blender(bdf_dict, font_name, origfilename, MAX_CHARS=256):
+
+ # first get a global width/height, also set the offsets
+ xmin = ymin = 10000000
+ xmax = ymax = -10000000
+
+ bitmap_offsets = [-1] * MAX_CHARS
+ bitmap_tot = 0
+ for i, c in enumerate(bdf_dict):
+ if c.has_key('BBX'):
+ bbx = c['BBX']
+ xmax = max(bbx[0], xmax)
+ ymax = max(bbx[1], ymax)
+ xmin = min(bbx[2], xmin)
+ ymin = min(bbx[3], ymin)
+
+ bitmap_offsets[i] = bitmap_tot
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list