[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20772] branches/soc-2009-yukishiro: merge from 20612 to 20771.

Jingyuan Huang jingyuan.huang at gmail.com
Wed Jun 10 05:08:20 CEST 2009


Revision: 20772
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20772
Author:   yukishiro
Date:     2009-06-10 05:08:18 +0200 (Wed, 10 Jun 2009)

Log Message:
-----------
merge from 20612 to 20771. scons linux2 BGE build is broken.

Modified Paths:
--------------
    branches/soc-2009-yukishiro/CMake/macros.cmake
    branches/soc-2009-yukishiro/CMakeLists.txt
    branches/soc-2009-yukishiro/bin/.blender/locale/de/LC_MESSAGES/blender.mo
    branches/soc-2009-yukishiro/config/irix6-config.py
    branches/soc-2009-yukishiro/config/linux2-config.py
    branches/soc-2009-yukishiro/config/win64-vc-config.py
    branches/soc-2009-yukishiro/extern/CMakeLists.txt
    branches/soc-2009-yukishiro/extern/Makefile
    branches/soc-2009-yukishiro/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
    branches/soc-2009-yukishiro/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
    branches/soc-2009-yukishiro/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
    branches/soc-2009-yukishiro/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
    branches/soc-2009-yukishiro/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
    branches/soc-2009-yukishiro/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
    branches/soc-2009-yukishiro/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
    branches/soc-2009-yukishiro/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
    branches/soc-2009-yukishiro/extern/bullet2/src/CMakeLists.txt
    branches/soc-2009-yukishiro/extern/bullet2/src/LinearMath/btScalar.h
    branches/soc-2009-yukishiro/extern/ffmpeg/Makefile
    branches/soc-2009-yukishiro/extern/ffmpeg/libavcodec/Makefile
    branches/soc-2009-yukishiro/extern/ffmpeg/libavcodec/eval.c
    branches/soc-2009-yukishiro/extern/ffmpeg/libavcodec/x86/dsputil_mmx.c
    branches/soc-2009-yukishiro/extern/ffmpeg/libavcodec/x86/x86inc.asm
    branches/soc-2009-yukishiro/extern/ffmpeg/libavformat/dv.c
    branches/soc-2009-yukishiro/extern/libopenjpeg/jp2.c
    branches/soc-2009-yukishiro/intern/CMakeLists.txt
    branches/soc-2009-yukishiro/intern/SoundSystem/openal/SND_OpenALDevice.cpp
    branches/soc-2009-yukishiro/intern/SoundSystem/sdl/SND_SDLCDDevice.cpp
    branches/soc-2009-yukishiro/intern/ghost/intern/GHOST_SystemCarbon.cpp
    branches/soc-2009-yukishiro/intern/ghost/intern/GHOST_SystemCarbon.h
    branches/soc-2009-yukishiro/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2009-yukishiro/intern/guardedalloc/intern/mmap_win.c
    branches/soc-2009-yukishiro/po/de.po
    branches/soc-2009-yukishiro/projectfiles_vc9/blender/blender.sln
    branches/soc-2009-yukishiro/projectfiles_vc9/blender/editors/ED_editors.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/converter/KX_converter.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/expression/EXP_expressions.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/ketsji/network/KX_network.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/scenegraph/SG_SceneGraph.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj
    branches/soc-2009-yukishiro/release/Makefile
    branches/soc-2009-yukishiro/release/datafiles/preview.blend
    branches/soc-2009-yukishiro/release/datafiles/splash.jpg
    branches/soc-2009-yukishiro/release/scripts/3ds_export.py
    branches/soc-2009-yukishiro/release/scripts/3ds_import.py
    branches/soc-2009-yukishiro/release/scripts/DirectX8Exporter.py
    branches/soc-2009-yukishiro/release/scripts/add_mesh_torus.py
    branches/soc-2009-yukishiro/release/scripts/bpymodules/BPyMathutils.py
    branches/soc-2009-yukishiro/release/scripts/bpymodules/BPyMesh.py
    branches/soc-2009-yukishiro/release/scripts/bpymodules/BPyMesh_redux.py
    branches/soc-2009-yukishiro/release/scripts/bpymodules/BPyWindow.py
    branches/soc-2009-yukishiro/release/scripts/bpymodules/colladaImEx/collada.py
    branches/soc-2009-yukishiro/release/scripts/bpymodules/colladaImEx/cstartup.py
    branches/soc-2009-yukishiro/release/scripts/bpymodules/colladaImEx/cutils.py
    branches/soc-2009-yukishiro/release/scripts/bpymodules/colladaImEx/translator.py
    branches/soc-2009-yukishiro/release/scripts/bpymodules/dxfLibrary.py
    branches/soc-2009-yukishiro/release/scripts/bpymodules/mesh_gradient.py
    branches/soc-2009-yukishiro/release/scripts/bpymodules/paths_svg2obj.py
    branches/soc-2009-yukishiro/release/scripts/c3d_import.py
    branches/soc-2009-yukishiro/release/scripts/colladaExport14.py
    branches/soc-2009-yukishiro/release/scripts/colladaImport14.py
    branches/soc-2009-yukishiro/release/scripts/console.py
    branches/soc-2009-yukishiro/release/scripts/envelope_symmetry.py
    branches/soc-2009-yukishiro/release/scripts/export_dxf.py
    branches/soc-2009-yukishiro/release/scripts/export_fbx.py
    branches/soc-2009-yukishiro/release/scripts/export_obj.py
    branches/soc-2009-yukishiro/release/scripts/help_bpy_api.py
    branches/soc-2009-yukishiro/release/scripts/help_getting_started.py
    branches/soc-2009-yukishiro/release/scripts/help_manual.py
    branches/soc-2009-yukishiro/release/scripts/help_release_notes.py
    branches/soc-2009-yukishiro/release/scripts/help_tutorials.py
    branches/soc-2009-yukishiro/release/scripts/help_web_blender.py
    branches/soc-2009-yukishiro/release/scripts/help_web_devcomm.py
    branches/soc-2009-yukishiro/release/scripts/help_web_eshop.py
    branches/soc-2009-yukishiro/release/scripts/help_web_usercomm.py
    branches/soc-2009-yukishiro/release/scripts/import_dxf.py
    branches/soc-2009-yukishiro/release/scripts/import_obj.py
    branches/soc-2009-yukishiro/release/scripts/import_web3d.py
    branches/soc-2009-yukishiro/release/scripts/lightwave_export.py
    branches/soc-2009-yukishiro/release/scripts/md2_export.py
    branches/soc-2009-yukishiro/release/scripts/mesh_mirror_tool.py
    branches/soc-2009-yukishiro/release/scripts/mesh_poly_reduce_grid.py
    branches/soc-2009-yukishiro/release/scripts/mesh_skin.py
    branches/soc-2009-yukishiro/release/scripts/mesh_unfolder.py
    branches/soc-2009-yukishiro/release/scripts/object_cookie_cutter.py
    branches/soc-2009-yukishiro/release/scripts/object_drop.py
    branches/soc-2009-yukishiro/release/scripts/ply_import.py
    branches/soc-2009-yukishiro/release/scripts/rvk1_torvk2.py
    branches/soc-2009-yukishiro/release/scripts/scripttemplate_gamelogic.py
    branches/soc-2009-yukishiro/release/scripts/scripttemplate_gamelogic_basic.py
    branches/soc-2009-yukishiro/release/scripts/uvcalc_quad_clickproj.py
    branches/soc-2009-yukishiro/release/scripts/uvcalc_smart_project.py
    branches/soc-2009-yukishiro/release/scripts/vertexpaint_selfshadow_ao.py
    branches/soc-2009-yukishiro/release/scripts/wizard_curve2tree.py
    branches/soc-2009-yukishiro/release/ui/buttons_data_armature.py
    branches/soc-2009-yukishiro/release/ui/buttons_data_camera.py
    branches/soc-2009-yukishiro/release/ui/buttons_data_curve.py
    branches/soc-2009-yukishiro/release/ui/buttons_data_lamp.py
    branches/soc-2009-yukishiro/release/ui/buttons_data_lattice.py
    branches/soc-2009-yukishiro/release/ui/buttons_data_mesh.py
    branches/soc-2009-yukishiro/release/ui/buttons_data_text.py
    branches/soc-2009-yukishiro/release/ui/buttons_material.py
    branches/soc-2009-yukishiro/release/ui/buttons_object_constraint.py
    branches/soc-2009-yukishiro/release/ui/buttons_particle.py
    branches/soc-2009-yukishiro/release/ui/buttons_scene.py
    branches/soc-2009-yukishiro/release/ui/buttons_texture.py
    branches/soc-2009-yukishiro/release/ui/buttons_world.py
    branches/soc-2009-yukishiro/release/ui/space_text.py
    branches/soc-2009-yukishiro/source/CMakeLists.txt
    branches/soc-2009-yukishiro/source/Makefile
    branches/soc-2009-yukishiro/source/blender/CMakeLists.txt
    branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_multires.h
    branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_particle.h
    branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_scene.h
    branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_sequence.h
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/Makefile
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/blender.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/bmfont.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/bullet.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/cloth.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/constraint.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/customdata.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/displist.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/effect.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/exotic.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/font.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/image.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/ipo.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/mball.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/modifier.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/multires.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/node.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/object.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/particle.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/sca.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/scene.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/sequence.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/shrinkwrap.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/softbody.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/world.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2009-yukishiro/source/blender/blenlib/BLI_string.h
    branches/soc-2009-yukishiro/source/blender/blenlib/BLI_threads.h
    branches/soc-2009-yukishiro/source/blender/blenlib/BLI_vfontdata.h
    branches/soc-2009-yukishiro/source/blender/blenlib/intern/storage.c
    branches/soc-2009-yukishiro/source/blender/blenlib/intern/string.c
    branches/soc-2009-yukishiro/source/blender/blenlib/intern/threads.c
    branches/soc-2009-yukishiro/source/blender/blenlib/intern/util.c
    branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c
    branches/soc-2009-yukishiro/source/blender/editors/animation/anim_draw.c
    branches/soc-2009-yukishiro/source/blender/editors/animation/anim_ipo_utils.c
    branches/soc-2009-yukishiro/source/blender/editors/animation/keyframing.c
    branches/soc-2009-yukishiro/source/blender/editors/armature/editarmature.c
    branches/soc-2009-yukishiro/source/blender/editors/armature/editarmature_sketch.c
    branches/soc-2009-yukishiro/source/blender/editors/armature/poseobject.c
    branches/soc-2009-yukishiro/source/blender/editors/armature/reeb.c
    branches/soc-2009-yukishiro/source/blender/editors/curve/editfont.c
    branches/soc-2009-yukishiro/source/blender/editors/datafiles/preview.blend.c
    branches/soc-2009-yukishiro/source/blender/editors/gpencil/drawgpencil.c
    branches/soc-2009-yukishiro/source/blender/editors/include/ED_fileselect.h
    branches/soc-2009-yukishiro/source/blender/editors/include/ED_previewrender.h
    branches/soc-2009-yukishiro/source/blender/editors/include/UI_interface.h
    branches/soc-2009-yukishiro/source/blender/editors/include/UI_resources.h
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface.c
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface_api.c
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface_handlers.c
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface_intern.h
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface_layout.c
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface_panel.c
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface_regions.c
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface_templates.c
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface_utils.c
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface_widgets.c
    branches/soc-2009-yukishiro/source/blender/editors/interface/view2d.c
    branches/soc-2009-yukishiro/source/blender/editors/mesh/editdeform.c
    branches/soc-2009-yukishiro/source/blender/editors/mesh/meshtools.c
    branches/soc-2009-yukishiro/source/blender/editors/object/editconstraint.c
    branches/soc-2009-yukishiro/source/blender/editors/object/object_edit.c
    branches/soc-2009-yukishiro/source/blender/editors/object/object_modifier.c
    branches/soc-2009-yukishiro/source/blender/editors/physics/editparticle.c
    branches/soc-2009-yukishiro/source/blender/editors/preview/previewrender.c
    branches/soc-2009-yukishiro/source/blender/editors/preview/previewrender_intern.h
    branches/soc-2009-yukishiro/source/blender/editors/screen/screen_edit.c
    branches/soc-2009-yukishiro/source/blender/editors/screen/screen_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/screen/screendump.c
    branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_light.c
    branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_context.c
    branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_header.c
    branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_intern.h
    branches/soc-2009-yukishiro/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2009-yukishiro/source/blender/editors/space_file/file_draw.c
    branches/soc-2009-yukishiro/source/blender/editors/space_file/file_header.c
    branches/soc-2009-yukishiro/source/blender/editors/space_file/file_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/space_file/filelist.c
    branches/soc-2009-yukishiro/source/blender/editors/space_file/filelist.h
    branches/soc-2009-yukishiro/source/blender/editors/space_file/filesel.c
    branches/soc-2009-yukishiro/source/blender/editors/space_file/space_file.c
    branches/soc-2009-yukishiro/source/blender/editors/space_image/image_header.c
    branches/soc-2009-yukishiro/source/blender/editors/space_image/image_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/space_node/node_edit.c
    branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2009-yukishiro/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2009-yukishiro/source/blender/gpu/GPU_material.h
    branches/soc-2009-yukishiro/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2009-yukishiro/source/blender/gpu/intern/gpu_material.c
    branches/soc-2009-yukishiro/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2009-yukishiro/source/blender/imbuf/intern/anim.c
    branches/soc-2009-yukishiro/source/blender/imbuf/intern/imageprocess.c
    branches/soc-2009-yukishiro/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2009-yukishiro/source/blender/imbuf/intern/rotate.c
    branches/soc-2009-yukishiro/source/blender/imbuf/intern/scaling.c
    branches/soc-2009-yukishiro/source/blender/makesdna/CMakeLists.txt
    branches/soc-2009-yukishiro/source/blender/makesdna/DNA_actuator_types.h
    branches/soc-2009-yukishiro/source/blender/makesdna/DNA_controller_types.h
    branches/soc-2009-yukishiro/source/blender/makesdna/DNA_object_force.h
    branches/soc-2009-yukishiro/source/blender/makesdna/DNA_object_types.h
    branches/soc-2009-yukishiro/source/blender/makesdna/DNA_particle_types.h
    branches/soc-2009-yukishiro/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2009-yukishiro/source/blender/makesdna/DNA_sensor_types.h
    branches/soc-2009-yukishiro/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2009-yukishiro/source/blender/makesdna/DNA_space_types.h
    branches/soc-2009-yukishiro/source/blender/makesdna/DNA_windowmanager_types.h
    branches/soc-2009-yukishiro/source/blender/makesdna/DNA_world_types.h
    branches/soc-2009-yukishiro/source/blender/makesrna/CMakeLists.txt
    branches/soc-2009-yukishiro/source/blender/makesrna/RNA_access.h
    branches/soc-2009-yukishiro/source/blender/makesrna/RNA_define.h
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/Makefile
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/SConscript
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/makesrna.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_access.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_context.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_define.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_internal_types.h
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_key.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_lamp.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_material.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_object.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_rna.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_sequence.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_space.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_ui.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_world.c
    branches/soc-2009-yukishiro/source/blender/nodes/intern/CMP_nodes/CMP_normalize.c
    branches/soc-2009-yukishiro/source/blender/nodes/intern/CMP_nodes/CMP_scale.c
    branches/soc-2009-yukishiro/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
    branches/soc-2009-yukishiro/source/blender/nodes/intern/SHD_nodes/SHD_material.c
    branches/soc-2009-yukishiro/source/blender/nodes/intern/SHD_nodes/SHD_math.c
    branches/soc-2009-yukishiro/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
    branches/soc-2009-yukishiro/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c
    branches/soc-2009-yukishiro/source/blender/nodes/intern/TEX_nodes/TEX_translate.c
    branches/soc-2009-yukishiro/source/blender/python/intern/bpy_interface.c
    branches/soc-2009-yukishiro/source/blender/python/intern/bpy_operator.c
    branches/soc-2009-yukishiro/source/blender/python/intern/bpy_operator.h
    branches/soc-2009-yukishiro/source/blender/python/intern/bpy_operator_wrap.c
    branches/soc-2009-yukishiro/source/blender/python/intern/bpy_rna.c
    branches/soc-2009-yukishiro/source/blender/python/intern/bpy_rna.h
    branches/soc-2009-yukishiro/source/blender/python/intern/bpy_ui.c
    branches/soc-2009-yukishiro/source/blender/render/extern/include/RE_shader_ext.h
    branches/soc-2009-yukishiro/source/blender/render/intern/source/convertblender.c
    branches/soc-2009-yukishiro/source/blender/render/intern/source/occlusion.c
    branches/soc-2009-yukishiro/source/blender/render/intern/source/pipeline.c
    branches/soc-2009-yukishiro/source/blender/render/intern/source/rayshade.c
    branches/soc-2009-yukishiro/source/blender/render/intern/source/rendercore.c
    branches/soc-2009-yukishiro/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2009-yukishiro/source/blender/render/intern/source/texture.c
    branches/soc-2009-yukishiro/source/blender/windowmanager/WM_api.h
    branches/soc-2009-yukishiro/source/blender/windowmanager/WM_types.h
    branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_cursors.c
    branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_jobs.c
    branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_subwindow.c
    branches/soc-2009-yukishiro/source/creator/CMakeLists.txt
    branches/soc-2009-yukishiro/source/creator/buildinfo.c
    branches/soc-2009-yukishiro/source/creator/creator.c
    branches/soc-2009-yukishiro/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2009-yukishiro/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/soc-2009-yukishiro/source/gameengine/CMakeLists.txt
    branches/soc-2009-yukishiro/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Converter/BL_ActionActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/soc-2009-yukishiro/source/gameengine/Converter/BL_ArmatureObject.h
    branches/soc-2009-yukishiro/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2009-yukishiro/source/gameengine/Converter/BL_DeformableGameObject.cpp
    branches/soc-2009-yukishiro/source/gameengine/Converter/BL_DeformableGameObject.h
    branches/soc-2009-yukishiro/source/gameengine/Converter/BL_MeshDeformer.cpp
    branches/soc-2009-yukishiro/source/gameengine/Converter/BL_MeshDeformer.h
    branches/soc-2009-yukishiro/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Converter/BL_ShapeActionActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Converter/BL_ShapeDeformer.cpp
    branches/soc-2009-yukishiro/source/gameengine/Converter/BL_ShapeDeformer.h
    branches/soc-2009-yukishiro/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/soc-2009-yukishiro/source/gameengine/Converter/BL_SkinDeformer.h
    branches/soc-2009-yukishiro/source/gameengine/Converter/BL_SkinMeshObject.cpp
    branches/soc-2009-yukishiro/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2009-yukishiro/source/gameengine/Converter/KX_BlenderSceneConverter.h
    branches/soc-2009-yukishiro/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/soc-2009-yukishiro/source/gameengine/Converter/KX_ConvertActuators.h
    branches/soc-2009-yukishiro/source/gameengine/Converter/KX_ConvertControllers.cpp
    branches/soc-2009-yukishiro/source/gameengine/Converter/KX_ConvertControllers.h
    branches/soc-2009-yukishiro/source/gameengine/Converter/KX_ConvertProperties.cpp
    branches/soc-2009-yukishiro/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/soc-2009-yukishiro/source/gameengine/Converter/KX_ConvertSensors.h
    branches/soc-2009-yukishiro/source/gameengine/Expressions/BoolValue.cpp
    branches/soc-2009-yukishiro/source/gameengine/Expressions/BoolValue.h
    branches/soc-2009-yukishiro/source/gameengine/Expressions/CMakeLists.txt
    branches/soc-2009-yukishiro/source/gameengine/Expressions/EmptyValue.cpp
    branches/soc-2009-yukishiro/source/gameengine/Expressions/ErrorValue.cpp
    branches/soc-2009-yukishiro/source/gameengine/Expressions/ErrorValue.h
    branches/soc-2009-yukishiro/source/gameengine/Expressions/FloatValue.cpp
    branches/soc-2009-yukishiro/source/gameengine/Expressions/FloatValue.h
    branches/soc-2009-yukishiro/source/gameengine/Expressions/IfExpr.cpp
    branches/soc-2009-yukishiro/source/gameengine/Expressions/InputParser.cpp
    branches/soc-2009-yukishiro/source/gameengine/Expressions/InputParser.h
    branches/soc-2009-yukishiro/source/gameengine/Expressions/IntValue.cpp
    branches/soc-2009-yukishiro/source/gameengine/Expressions/IntValue.h
    branches/soc-2009-yukishiro/source/gameengine/Expressions/ListValue.cpp
    branches/soc-2009-yukishiro/source/gameengine/Expressions/ListValue.h
    branches/soc-2009-yukishiro/source/gameengine/Expressions/Makefile
    branches/soc-2009-yukishiro/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/soc-2009-yukishiro/source/gameengine/Expressions/PyObjectPlus.h
    branches/soc-2009-yukishiro/source/gameengine/Expressions/SConscript
    branches/soc-2009-yukishiro/source/gameengine/Expressions/StringValue.cpp
    branches/soc-2009-yukishiro/source/gameengine/Expressions/StringValue.h
    branches/soc-2009-yukishiro/source/gameengine/Expressions/Value.cpp
    branches/soc-2009-yukishiro/source/gameengine/Expressions/Value.h
    branches/soc-2009-yukishiro/source/gameengine/Expressions/VectorValue.cpp
    branches/soc-2009-yukishiro/source/gameengine/Expressions/VectorValue.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/CMakeLists.txt
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/Joystick/Makefile
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/Makefile
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_2DFilterActuator.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ANDController.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ANDController.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ActuatorSensor.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_AlwaysEventManager.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_AlwaysSensor.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_DelaySensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_DelaySensor.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_EventManager.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_EventManager.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ExpressionController.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ExpressionController.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_IActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_IActuator.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_IController.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_IController.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ILogicBrick.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_IObject.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_IObject.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_IScene.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_IScene.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ISensor.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_JoystickManager.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_JoystickSensor.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_KeyboardManager.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_KeyboardSensor.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_LogicManager.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_LogicManager.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_MouseManager.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_MouseSensor.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_NANDController.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_NANDController.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_NORController.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_NORController.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ORController.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ORController.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_PropertyActuator.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_PropertyEventManager.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_PropertySensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_PropertySensor.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_PythonController.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_RandomActuator.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_RandomEventManager.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_RandomSensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_RandomSensor.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_TimeEventManager.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_XNORController.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_XNORController.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_XORController.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_XORController.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SConscript
    branches/soc-2009-yukishiro/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
    branches/soc-2009-yukishiro/source/gameengine/GamePlayer/CMakeLists.txt
    branches/soc-2009-yukishiro/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/soc-2009-yukishiro/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2009-yukishiro/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2009-yukishiro/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/BL_BlenderShader.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/BL_Material.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/BL_Material.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/BL_Shader.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/BL_Shader.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/CMakeLists.txt
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KXNetwork/Makefile
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KXNetwork/SConscript
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_BulletPhysicsController.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_CDActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_CDActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_Camera.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_Camera.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_CameraActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ClientObjectInfo.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ConstraintActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ConstraintWrapper.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_Dome.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_Dome.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_GameActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_GameActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_IPO_SGController.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_IPhysicsController.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_IPhysicsController.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_IpoActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_Light.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_Light.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_MeshProxy.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_MotionState.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_MotionState.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_MouseFocusSensor.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_NearSensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_NearSensor.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ObjectActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_OdePhysicsController.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ParentActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ParentActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PolyProxy.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PolyProxy.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PolygonMaterial.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PyMath.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PyMath.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PythonInit.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_RadarSensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_RadarSensor.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_RayEventManager.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_RaySensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_RaySensor.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SG_NodeRelationships.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_Scene.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SceneActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SceneActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SoundActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_StateActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_StateActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SumoPhysicsController.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_TouchEventManager.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_TouchSensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_TouchSensor.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_TrackToActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_VehicleWrapper.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_VertexProxy.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_VertexProxy.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_VisibilityActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/SConscript
    branches/soc-2009-yukishiro/source/gameengine/Network/NG_NetworkScene.cpp
    branches/soc-2009-yukishiro/source/gameengine/Physics/BlOde/OdePhysicsController.cpp
    branches/soc-2009-yukishiro/source/gameengine/Physics/BlOde/OdePhysicsController.h
    branches/soc-2009-yukishiro/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp
    branches/soc-2009-yukishiro/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.h
    branches/soc-2009-yukishiro/source/gameengine/Physics/Bullet/CMakeLists.txt
    branches/soc-2009-yukishiro/source/gameengine/Physics/Bullet/CcdGraphicController.cpp
    branches/soc-2009-yukishiro/source/gameengine/Physics/Bullet/CcdGraphicController.h
    branches/soc-2009-yukishiro/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/soc-2009-yukishiro/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/soc-2009-yukishiro/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/soc-2009-yukishiro/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/soc-2009-yukishiro/source/gameengine/Physics/Bullet/Makefile
    branches/soc-2009-yukishiro/source/gameengine/Physics/Bullet/SConscript
    branches/soc-2009-yukishiro/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
    branches/soc-2009-yukishiro/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
    branches/soc-2009-yukishiro/source/gameengine/Physics/Sumo/SumoPhysicsController.cpp
    branches/soc-2009-yukishiro/source/gameengine/Physics/Sumo/SumoPhysicsController.h
    branches/soc-2009-yukishiro/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
    branches/soc-2009-yukishiro/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h
    branches/soc-2009-yukishiro/source/gameengine/Physics/common/PHY_IGraphicController.h
    branches/soc-2009-yukishiro/source/gameengine/Physics/common/PHY_IMotionState.h
    branches/soc-2009-yukishiro/source/gameengine/Physics/common/PHY_IPhysicsController.h
    branches/soc-2009-yukishiro/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/GameKeys.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/GameLogic.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/GameTypes.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/Rasterizer.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/bge_api_validate_py.txt
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/epy_docgen.sh
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/CMakeLists.txt
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/Makefile
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_BucketManager.h
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_CameraData.h
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_Deformer.h
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_FramingManager.cpp
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_FramingManager.h
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_MaterialBucket.h
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_MeshObject.cpp
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_MeshObject.h
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_TexVert.cpp
    branches/soc-2009-yukishiro/source/gameengine/Rasterizer/SConscript
    branches/soc-2009-yukishiro/source/gameengine/SceneGraph/SG_IObject.cpp
    branches/soc-2009-yukishiro/source/gameengine/SceneGraph/SG_IObject.h
    branches/soc-2009-yukishiro/source/gameengine/SceneGraph/SG_Node.cpp
    branches/soc-2009-yukishiro/source/gameengine/SceneGraph/SG_Node.h
    branches/soc-2009-yukishiro/source/gameengine/SceneGraph/SG_Spatial.cpp
    branches/soc-2009-yukishiro/source/gameengine/SceneGraph/SG_Spatial.h
    branches/soc-2009-yukishiro/source/gameengine/VideoTexture/BlendType.h
    branches/soc-2009-yukishiro/source/gameengine/VideoTexture/FilterBlueScreen.cpp
    branches/soc-2009-yukishiro/source/gameengine/VideoTexture/FilterColor.cpp
    branches/soc-2009-yukishiro/source/gameengine/VideoTexture/FilterNormal.cpp
    branches/soc-2009-yukishiro/source/gameengine/VideoTexture/FilterSource.cpp
    branches/soc-2009-yukishiro/source/gameengine/VideoTexture/ImageBase.cpp
    branches/soc-2009-yukishiro/source/gameengine/VideoTexture/ImageBuff.cpp
    branches/soc-2009-yukishiro/source/gameengine/VideoTexture/ImageMix.cpp
    branches/soc-2009-yukishiro/source/gameengine/VideoTexture/ImageRender.cpp
    branches/soc-2009-yukishiro/source/gameengine/VideoTexture/ImageViewport.cpp
    branches/soc-2009-yukishiro/source/gameengine/VideoTexture/PyTypeList.cpp
    branches/soc-2009-yukishiro/source/gameengine/VideoTexture/Texture.cpp
    branches/soc-2009-yukishiro/source/gameengine/VideoTexture/VideoBase.cpp
    branches/soc-2009-yukishiro/source/gameengine/VideoTexture/VideoBase.h
    branches/soc-2009-yukishiro/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/soc-2009-yukishiro/source/gameengine/VideoTexture/VideoFFmpeg.h
    branches/soc-2009-yukishiro/source/gameengine/VideoTexture/blendVideoTex.cpp
    branches/soc-2009-yukishiro/source/kernel/gen_system/GEN_HashedPtr.cpp
    branches/soc-2009-yukishiro/source/nan_definitions.mk
    branches/soc-2009-yukishiro/tools/Blender.py
    branches/soc-2009-yukishiro/tools/btools.py

Added Paths:
-----------
    branches/soc-2009-yukishiro/extern/ffmpeg/patches/ffmpeg_work_around_ac3_sse2_crash.patch
    branches/soc-2009-yukishiro/extern/ffmpeg/patches/ffmpeg_work_around_dv_crash.patch
    branches/soc-2009-yukishiro/release/scripts/animation_clean.py
    branches/soc-2009-yukishiro/release/scripts/image_2d_cutout.py
    branches/soc-2009-yukishiro/release/scripts/object_active_to_other.py
    branches/soc-2009-yukishiro/release/scripts/scripttemplate_gamelogic_module.py
    branches/soc-2009-yukishiro/release/scripts/textplugin_convert_ge.py
    branches/soc-2009-yukishiro/release/scripts/wizard_bolt_factory.py
    branches/soc-2009-yukishiro/release/scripts/wizard_landscape_ant.py
    branches/soc-2009-yukishiro/release/text/release_249.txt
    branches/soc-2009-yukishiro/release/ui/space_sequencer.py
    branches/soc-2009-yukishiro/release/windows/extra/python26.zip
    branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_buttons.c
    branches/soc-2009-yukishiro/source/gameengine/Converter/BL_ModifierDeformer.cpp
    branches/soc-2009-yukishiro/source/gameengine/Converter/BL_ModifierDeformer.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PythonSeq.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PythonSeq.h
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/API_intro.py
    branches/soc-2009-yukishiro/source/gameengine/SceneGraph/SG_DList.h
    branches/soc-2009-yukishiro/source/gameengine/SceneGraph/SG_QList.h

Removed Paths:
-------------
    branches/soc-2009-yukishiro/intern/SoundSystem/fmod/
    branches/soc-2009-yukishiro/release/scripts/bpymodules/BPyMesh_octree.py
    branches/soc-2009-yukishiro/release/scripts/xfig_export.py
    branches/soc-2009-yukishiro/release/text/release_247.txt
    branches/soc-2009-yukishiro/release/text/release_248.txt
    branches/soc-2009-yukishiro/release/windows/extra/python26.zip
    branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_header.c
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/BL_ActionActuator.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/BL_Shader.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/BL_ShapeActionActuator.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/CListValue.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_BlenderMaterial.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_CDActuator.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_Camera.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_CameraActuator.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_ConstraintActuator.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_ConstraintWrapper.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_GameActuator.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_GameObject.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_IpoActuator.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_LightObject.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_MeshProxy.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_MouseFocusSensor.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_NearSensor.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_NetworkMessageActuator.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_NetworkMessageSensor.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_ObjectActuator.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_ParentActuator.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_PhysicsObjectWrapper.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_PolyProxy.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_PolygonMaterial.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_RadarSensor.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_RaySensor.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_SCA_AddObjectActuator.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_SCA_DynamicActuator.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_SCA_EndObjectActuator.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_SCA_ReplaceMeshActuator.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_Scene.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_SceneActuator.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_SoundActuator.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_StateActuator.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_TouchSensor.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_TrackToActuator.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_VehicleWrapper.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_VertexProxy.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/KX_VisibilityActuator.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/SCA_2DFilterActuator.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/SCA_ANDController.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/SCA_ActuatorSensor.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/SCA_AlwaysSensor.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/SCA_DelaySensor.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/SCA_IActuator.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/SCA_IController.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/SCA_ILogicBrick.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/SCA_ISensor.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/SCA_JoystickSensor.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/SCA_KeyboardSensor.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/SCA_MouseSensor.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/SCA_NANDController.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/SCA_NORController.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/SCA_ORController.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/SCA_PropertyActuator.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/SCA_PropertySensor.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/SCA_PythonController.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/SCA_RandomActuator.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/SCA_RandomSensor.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/SCA_XNORController.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/SCA_XORController.py
    branches/soc-2009-yukishiro/source/gameengine/PyDoc/WhatsNew.py

Modified: branches/soc-2009-yukishiro/CMake/macros.cmake
===================================================================
--- branches/soc-2009-yukishiro/CMake/macros.cmake	2009-06-09 22:56:43 UTC (rev 20771)
+++ branches/soc-2009-yukishiro/CMake/macros.cmake	2009-06-10 03:08:18 UTC (rev 20772)
@@ -59,9 +59,26 @@
 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_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})
+
+  # 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)
+
+
+  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

Modified: branches/soc-2009-yukishiro/CMakeLists.txt
===================================================================
--- branches/soc-2009-yukishiro/CMakeLists.txt	2009-06-09 22:56:43 UTC (rev 20771)
+++ branches/soc-2009-yukishiro/CMakeLists.txt	2009-06-10 03:08:18 UTC (rev 20772)
@@ -99,20 +99,6 @@
     ENDIF(OPENAL_FOUND)
   ENDIF(WITH_OPENAL)
 
-  FIND_LIBRARY(ALUT_LIBRARY
-    NAMES alut
-    PATHS
-    /usr/local/lib
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-  )
-  IF(ALUT_LIBRARY)
-    SET(OPENAL_LIB ${OPENAL_LIB} ${ALUT_LIBRARY})
-  ENDIF(ALUT_LIBRARY)
-
   FIND_LIBRARY(INTL_LIBRARY
     NAMES intl
     PATHS
@@ -288,7 +274,7 @@
 
   SET(FFMPEG ${LIBDIR}/ffmpeg)
   SET(FFMPEG_INC ${FFMPEG}/include)
-  SET(FFMPEG_LIB avcodec-51 avformat-52 avdevice-52 avutil-49 swscale-0)
+  SET(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0)
   SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
 
   IF(CMAKE_CL_64)
@@ -468,20 +454,18 @@
 #-----------------------------------------------------------------------------
 # Libraries
 FILE(WRITE ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt "")
-SUBDIRS(
-  intern
-  extern
-  source
-)
+ADD_SUBDIRECTORY(intern)
+ADD_SUBDIRECTORY(extern)
+ADD_SUBDIRECTORY(source)
 
 
 #-----------------------------------------------------------------------------
 # Blender Application
-SUBDIRS(source/creator)
+ADD_SUBDIRECTORY(source/creator)
 
 
 #-----------------------------------------------------------------------------
 # Blender Player
 IF(WITH_PLAYER)
-  SUBDIRS(blenderplayer)
+  ADD_SUBDIRECTORY(blenderplayer)
 ENDIF(WITH_PLAYER)

Modified: branches/soc-2009-yukishiro/bin/.blender/locale/de/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)

Modified: branches/soc-2009-yukishiro/config/irix6-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/irix6-config.py	2009-06-09 22:56:43 UTC (rev 20771)
+++ branches/soc-2009-yukishiro/config/irix6-config.py	2009-06-10 03:08:18 UTC (rev 20772)
@@ -20,11 +20,6 @@
 BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
 BF_OPENAL_LIBPATH = LIBDIR + '/lib'
 
-# some distros have a separate libalut
-# if you get linker complaints, you need to uncomment the line below
-# BF_OPENAL_LIB = 'openal alut'  
-# BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a ${BF_OPENAL}/lib/libalut.a'
-
 BF_CXX = '/usr'
 WITH_BF_STATICCXX = 'false'
 BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'

Modified: branches/soc-2009-yukishiro/config/linux2-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/linux2-config.py	2009-06-09 22:56:43 UTC (rev 20771)
+++ branches/soc-2009-yukishiro/config/linux2-config.py	2009-06-10 03:08:18 UTC (rev 20772)
@@ -1,9 +1,17 @@
 LCGDIR = '../lib/linux2'
 LIBDIR = "${LCGDIR}"
 
+def py_version_string():
+	'''
+	returns py version - "2.5", "2.6" etc
+	'''
+	import platform
+	ver = platform.python_version_tuple()
+	return '%d.%d' % (int(ver[0]), int(ver[1])) # py2.5 uses strings, 2.6 ints
+
 BF_PYTHON = '/usr'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-BF_PYTHON_VERSION = '2.5'
+BF_PYTHON_VERSION = py_version_string()
 WITH_BF_STATICPYTHON = False
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
 BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
@@ -18,11 +26,6 @@
 BF_OPENAL_LIB = 'openal'
 BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
 
-# some distros have a separate libalut
-# if you get linker complaints, you need to uncomment the line below
-# BF_OPENAL_LIB = 'openal alut'  
-# BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a ${BF_OPENAL}/lib/libalut.a'
-
 BF_CXX = '/usr'
 WITH_BF_STATICCXX = False
 BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
@@ -71,7 +74,8 @@
 BF_GETTEXT_LIB = 'gettextlib'
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
-WITH_BF_GAMEENGINE=False
+WITH_BF_GAMEENGINE = False 
+WITH_BF_PLAYER = False
 
 WITH_BF_ODE = False
 BF_ODE = LIBDIR + '/ode'

Modified: branches/soc-2009-yukishiro/config/win64-vc-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/win64-vc-config.py	2009-06-09 22:56:43 UTC (rev 20771)
+++ branches/soc-2009-yukishiro/config/win64-vc-config.py	2009-06-10 03:08:18 UTC (rev 20772)
@@ -182,7 +182,7 @@
 BF_DEBUG=False
 BF_BSC=False
 CFLAGS = []
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT', '/openmp']
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
 CXXFLAGS = ['/EHsc']
 
 if BF_DEBUG:
@@ -190,7 +190,7 @@
 else:
 	BF_NUMJOBS=6
 
-PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/ENTRY:mainCRTStartup','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"','/LARGEADDRESSAWARE']
+PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/ENTRY:mainCRTStartup','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"']
 
 BF_BUILDDIR = '..\\build\\blender25-win64-vc'
 BF_INSTALLDIR='..\\install\\blender25-win64-vc'

Modified: branches/soc-2009-yukishiro/extern/CMakeLists.txt
===================================================================
--- branches/soc-2009-yukishiro/extern/CMakeLists.txt	2009-06-09 22:56:43 UTC (rev 20771)
+++ branches/soc-2009-yukishiro/extern/CMakeLists.txt	2009-06-10 03:08:18 UTC (rev 20772)
@@ -25,19 +25,20 @@
 # ***** END GPL LICENSE BLOCK *****
 
 IF(WITH_GAMEENGINE)
-  SUBDIRS(qhull solid)
+  ADD_SUBDIRECTORY(qhull)
+  ADD_SUBDIRECTORY(solid)
 ENDIF(WITH_GAMEENGINE)
 
 IF(WITH_BULLET)
-  SUBDIRS(bullet2)
+  ADD_SUBDIRECTORY(bullet2)
 ENDIF(WITH_BULLET)
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-  SUBDIRS(binreloc)
+  ADD_SUBDIRECTORY(binreloc)
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
-SUBDIRS(glew)
+ADD_SUBDIRECTORY(glew)
 
 IF(WITH_OPENJPEG)
-  SUBDIRS(libopenjpeg)
+  ADD_SUBDIRECTORY(libopenjpeg)
 ENDIF(WITH_OPENJPEG)

Modified: branches/soc-2009-yukishiro/extern/Makefile
===================================================================
--- branches/soc-2009-yukishiro/extern/Makefile	2009-06-09 22:56:43 UTC (rev 20771)
+++ branches/soc-2009-yukishiro/extern/Makefile	2009-06-10 03:08:18 UTC (rev 20772)
@@ -41,9 +41,10 @@
 endif
 endif
 
-ifneq ($(NAN_NO_KETSJI), true)
-    DIRS += bullet2
-endif
+# Cloth requires it
+#ifneq ($(NAN_NO_KETSJI), true)
+DIRS += bullet2
+#endif
 
 ifeq ($(WITH_BINRELOC), true)
     DIRS += binreloc

Modified: branches/soc-2009-yukishiro/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
===================================================================
--- branches/soc-2009-yukishiro/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp	2009-06-09 22:56:43 UTC (rev 20771)
+++ branches/soc-2009-yukishiro/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp	2009-06-10 03:08:18 UTC (rev 20772)
@@ -22,13 +22,14 @@
 #include "LinearMath/btMinMax.h"
 #include <new>
 
-//-----------------------------------------------------------------------------
 
+
+//#define CONETWIST_USE_OBSOLETE_SOLVER true
 #define CONETWIST_USE_OBSOLETE_SOLVER false
 #define CONETWIST_DEF_FIX_THRESH btScalar(.05f)
 
-//-----------------------------------------------------------------------------
 
+
 btConeTwistConstraint::btConeTwistConstraint()
 :btTypedConstraint(CONETWIST_CONSTRAINT_TYPE),
 m_useSolveConstraintObsolete(CONETWIST_USE_OBSOLETE_SOLVER)
@@ -63,14 +64,14 @@
 	m_bMotorEnabled = false;
 	m_maxMotorImpulse = btScalar(-1);
 
-	setLimit(btScalar(1e30), btScalar(1e30), btScalar(1e30));
+	setLimit(btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT));
 	m_damping = btScalar(0.01);
 	m_fixThresh = CONETWIST_DEF_FIX_THRESH;
 }
 
 
-//-----------------------------------------------------------------------------
 
+
 void btConeTwistConstraint::getInfo1 (btConstraintInfo1* info)
 {
 	if (m_useSolveConstraintObsolete)
@@ -99,10 +100,10 @@
 			info->nub--;
 		}
 	}
-} // btConeTwistConstraint::getInfo1()
+}
 	
-//-----------------------------------------------------------------------------
 
+
 void btConeTwistConstraint::getInfo2 (btConstraintInfo2* info)
 {
 	btAssert(!m_useSolveConstraintObsolete);
@@ -230,8 +231,8 @@
 	}
 }
 	
-//-----------------------------------------------------------------------------
 
+
 void	btConeTwistConstraint::buildJacobian()
 {
 	if (m_useSolveConstraintObsolete)
@@ -239,6 +240,7 @@
 		m_appliedImpulse = btScalar(0.);
 		m_accTwistLimitImpulse = btScalar(0.);
 		m_accSwingLimitImpulse = btScalar(0.);

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list