[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20159] branches/ge_dome: merge -r 19528-HEAD (20156)

Dalai Felinto dfelinto at gmail.com
Mon May 11 20:26:47 CEST 2009


Revision: 20159
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20159
Author:   dfelinto
Date:     2009-05-11 20:26:47 +0200 (Mon, 11 May 2009)

Log Message:
-----------
merge -r 19528-HEAD (20156)
starting dome test period again :) (i.e. not over committing in the trunk)

Modified Paths:
--------------
    branches/ge_dome/CMakeLists.txt
    branches/ge_dome/Makefile
    branches/ge_dome/SConstruct
    branches/ge_dome/config/linux2-config.py
    branches/ge_dome/dlltool/Makefile
    branches/ge_dome/extern/Makefile
    branches/ge_dome/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
    branches/ge_dome/extern/ffmpeg/Makefile
    branches/ge_dome/extern/ffmpeg/libavcodec/Makefile
    branches/ge_dome/extern/ffmpeg/libavcodec/x86/x86inc.asm
    branches/ge_dome/extern/libopenjpeg/opj_includes.h
    branches/ge_dome/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/ge_dome/intern/ghost/intern/GHOST_SystemX11.h
    branches/ge_dome/intern/moto/include/MT_Quaternion.inl
    branches/ge_dome/po/Makefile
    branches/ge_dome/po/zh_CN.po
    branches/ge_dome/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
    branches/ge_dome/projectfiles_vc9/blender/blender.vcproj
    branches/ge_dome/projectfiles_vc9/gameengine/converter/KX_converter.vcproj
    branches/ge_dome/projectfiles_vc9/gameengine/expression/EXP_expressions.vcproj
    branches/ge_dome/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj
    branches/ge_dome/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
    branches/ge_dome/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj
    branches/ge_dome/projectfiles_vc9/gameengine/ketsji/network/KX_network.vcproj
    branches/ge_dome/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
    branches/ge_dome/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Physics.vcproj
    branches/ge_dome/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj
    branches/ge_dome/projectfiles_vc9/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
    branches/ge_dome/projectfiles_vc9/gameengine/scenegraph/SG_SceneGraph.vcproj
    branches/ge_dome/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj
    branches/ge_dome/release/scripts/3ds_export.py
    branches/ge_dome/release/scripts/3ds_import.py
    branches/ge_dome/release/scripts/DirectX8Exporter.py
    branches/ge_dome/release/scripts/add_mesh_torus.py
    branches/ge_dome/release/scripts/bevel_center.py
    branches/ge_dome/release/scripts/bpymodules/colladaImEx/collada.py
    branches/ge_dome/release/scripts/bpymodules/colladaImEx/cstartup.py
    branches/ge_dome/release/scripts/bpymodules/colladaImEx/cutils.py
    branches/ge_dome/release/scripts/bpymodules/colladaImEx/translator.py
    branches/ge_dome/release/scripts/bpymodules/dxfLibrary.py
    branches/ge_dome/release/scripts/bpymodules/paths_svg2obj.py
    branches/ge_dome/release/scripts/colladaExport14.py
    branches/ge_dome/release/scripts/colladaImport14.py
    branches/ge_dome/release/scripts/console.py
    branches/ge_dome/release/scripts/export_dxf.py
    branches/ge_dome/release/scripts/export_fbx.py
    branches/ge_dome/release/scripts/help_bpy_api.py
    branches/ge_dome/release/scripts/help_getting_started.py
    branches/ge_dome/release/scripts/help_manual.py
    branches/ge_dome/release/scripts/help_release_notes.py
    branches/ge_dome/release/scripts/help_tutorials.py
    branches/ge_dome/release/scripts/help_web_blender.py
    branches/ge_dome/release/scripts/help_web_devcomm.py
    branches/ge_dome/release/scripts/help_web_eshop.py
    branches/ge_dome/release/scripts/help_web_usercomm.py
    branches/ge_dome/release/scripts/import_dxf.py
    branches/ge_dome/release/scripts/import_obj.py
    branches/ge_dome/release/scripts/import_web3d.py
    branches/ge_dome/release/scripts/lightwave_export.py
    branches/ge_dome/release/scripts/md2_export.py
    branches/ge_dome/release/scripts/object_cookie_cutter.py
    branches/ge_dome/release/scripts/scripttemplate_gamelogic.py
    branches/ge_dome/release/scripts/scripttemplate_gamelogic_basic.py
    branches/ge_dome/release/scripts/vertexpaint_selfshadow_ao.py
    branches/ge_dome/source/Makefile
    branches/ge_dome/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/ge_dome/source/blender/blenkernel/BKE_bad_level_calls.h
    branches/ge_dome/source/blender/blenkernel/BKE_booleanops.h
    branches/ge_dome/source/blender/blenkernel/BKE_bvhutils.h
    branches/ge_dome/source/blender/blenkernel/BKE_curve.h
    branches/ge_dome/source/blender/blenkernel/BKE_particle.h
    branches/ge_dome/source/blender/blenkernel/BKE_scene.h
    branches/ge_dome/source/blender/blenkernel/BKE_shrinkwrap.h
    branches/ge_dome/source/blender/blenkernel/SConscript
    branches/ge_dome/source/blender/blenkernel/bad_level_call_stubs/stubs.c
    branches/ge_dome/source/blender/blenkernel/intern/DerivedMesh.c
    branches/ge_dome/source/blender/blenkernel/intern/Makefile
    branches/ge_dome/source/blender/blenkernel/intern/blender.c
    branches/ge_dome/source/blender/blenkernel/intern/bmfont.c
    branches/ge_dome/source/blender/blenkernel/intern/bullet.c
    branches/ge_dome/source/blender/blenkernel/intern/bvhutils.c
    branches/ge_dome/source/blender/blenkernel/intern/constraint.c
    branches/ge_dome/source/blender/blenkernel/intern/customdata.c
    branches/ge_dome/source/blender/blenkernel/intern/displist.c
    branches/ge_dome/source/blender/blenkernel/intern/effect.c
    branches/ge_dome/source/blender/blenkernel/intern/exotic.c
    branches/ge_dome/source/blender/blenkernel/intern/font.c
    branches/ge_dome/source/blender/blenkernel/intern/image.c
    branches/ge_dome/source/blender/blenkernel/intern/ipo.c
    branches/ge_dome/source/blender/blenkernel/intern/modifier.c
    branches/ge_dome/source/blender/blenkernel/intern/multires.c
    branches/ge_dome/source/blender/blenkernel/intern/node.c
    branches/ge_dome/source/blender/blenkernel/intern/object.c
    branches/ge_dome/source/blender/blenkernel/intern/particle.c
    branches/ge_dome/source/blender/blenkernel/intern/particle_system.c
    branches/ge_dome/source/blender/blenkernel/intern/scene.c
    branches/ge_dome/source/blender/blenkernel/intern/shrinkwrap.c
    branches/ge_dome/source/blender/blenkernel/intern/world.c
    branches/ge_dome/source/blender/blenlib/BLI_blenlib.h
    branches/ge_dome/source/blender/blenlib/BLI_vfontdata.h
    branches/ge_dome/source/blender/blenlib/intern/storage.c
    branches/ge_dome/source/blender/blenlib/intern/util.c
    branches/ge_dome/source/blender/blenloader/intern/readfile.c
    branches/ge_dome/source/blender/gpu/intern/gpu_draw.c
    branches/ge_dome/source/blender/imbuf/intern/anim5.c
    branches/ge_dome/source/blender/imbuf/intern/imageprocess.c
    branches/ge_dome/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/ge_dome/source/blender/imbuf/intern/rotate.c
    branches/ge_dome/source/blender/imbuf/intern/scaling.c
    branches/ge_dome/source/blender/include/BDR_gpencil.h
    branches/ge_dome/source/blender/include/BIF_butspace.h
    branches/ge_dome/source/blender/include/BIF_editfont.h
    branches/ge_dome/source/blender/include/BIF_editseq.h
    branches/ge_dome/source/blender/include/BIF_poseobject.h
    branches/ge_dome/source/blender/include/blendef.h
    branches/ge_dome/source/blender/include/butspace.h
    branches/ge_dome/source/blender/makesdna/DNA_actuator_types.h
    branches/ge_dome/source/blender/makesdna/DNA_constraint_types.h
    branches/ge_dome/source/blender/makesdna/DNA_controller_types.h
    branches/ge_dome/source/blender/makesdna/DNA_modifier_types.h
    branches/ge_dome/source/blender/makesdna/DNA_object_force.h
    branches/ge_dome/source/blender/makesdna/DNA_object_types.h
    branches/ge_dome/source/blender/makesdna/DNA_scene_types.h
    branches/ge_dome/source/blender/makesdna/DNA_sensor_types.h
    branches/ge_dome/source/blender/makesdna/DNA_space_types.h
    branches/ge_dome/source/blender/makesdna/DNA_world_types.h
    branches/ge_dome/source/blender/nodes/SConscript
    branches/ge_dome/source/blender/nodes/intern/CMP_nodes/CMP_normalize.c
    branches/ge_dome/source/blender/nodes/intern/CMP_nodes/CMP_scale.c
    branches/ge_dome/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
    branches/ge_dome/source/blender/nodes/intern/SHD_nodes/SHD_math.c
    branches/ge_dome/source/blender/nodes/intern/TEX_nodes/TEX_distance.c
    branches/ge_dome/source/blender/nodes/intern/TEX_nodes/TEX_texture.c
    branches/ge_dome/source/blender/nodes/intern/TEX_util.c
    branches/ge_dome/source/blender/python/BPY_interface.c
    branches/ge_dome/source/blender/python/SConscript
    branches/ge_dome/source/blender/python/api2_2x/BGL.c
    branches/ge_dome/source/blender/python/api2_2x/BGL.h
    branches/ge_dome/source/blender/python/api2_2x/Blender.c
    branches/ge_dome/source/blender/python/api2_2x/Draw.c
    branches/ge_dome/source/blender/python/api2_2x/Geometry.c
    branches/ge_dome/source/blender/python/api2_2x/Geometry.h
    branches/ge_dome/source/blender/python/api2_2x/Group.c
    branches/ge_dome/source/blender/python/api2_2x/Key.c
    branches/ge_dome/source/blender/python/api2_2x/Lamp.c
    branches/ge_dome/source/blender/python/api2_2x/Mathutils.c
    branches/ge_dome/source/blender/python/api2_2x/Mathutils.h
    branches/ge_dome/source/blender/python/api2_2x/Node.c
    branches/ge_dome/source/blender/python/api2_2x/Object.c
    branches/ge_dome/source/blender/python/api2_2x/Particle.c
    branches/ge_dome/source/blender/python/api2_2x/Scene.c
    branches/ge_dome/source/blender/python/api2_2x/Texture.c
    branches/ge_dome/source/blender/python/api2_2x/Types.c
    branches/ge_dome/source/blender/python/api2_2x/Window.c
    branches/ge_dome/source/blender/python/api2_2x/doc/Geometry.py
    branches/ge_dome/source/blender/python/api2_2x/doc/Image.py
    branches/ge_dome/source/blender/python/api2_2x/doc/Lamp.py
    branches/ge_dome/source/blender/python/api2_2x/doc/Library.py
    branches/ge_dome/source/blender/python/api2_2x/doc/Mathutils.py
    branches/ge_dome/source/blender/python/api2_2x/doc/Particle.py
    branches/ge_dome/source/blender/python/api2_2x/doc/SConscript
    branches/ge_dome/source/blender/python/api2_2x/euler.c
    branches/ge_dome/source/blender/python/api2_2x/gen_utils.c
    branches/ge_dome/source/blender/python/api2_2x/gen_utils.h
    branches/ge_dome/source/blender/python/api2_2x/matrix.c
    branches/ge_dome/source/blender/python/api2_2x/modules.h
    branches/ge_dome/source/blender/python/api2_2x/quat.c
    branches/ge_dome/source/blender/python/api2_2x/vector.c
    branches/ge_dome/source/blender/python/api2_2x/vector.h
    branches/ge_dome/source/blender/render/intern/source/convertblender.c
    branches/ge_dome/source/blender/render/intern/source/occlusion.c
    branches/ge_dome/source/blender/render/intern/source/pipeline.c
    branches/ge_dome/source/blender/render/intern/source/rayshade.c
    branches/ge_dome/source/blender/render/intern/source/renderdatabase.c
    branches/ge_dome/source/blender/render/intern/source/texture.c
    branches/ge_dome/source/blender/src/SConscript
    branches/ge_dome/source/blender/src/booleanops.c
    branches/ge_dome/source/blender/src/buttons_editing.c
    branches/ge_dome/source/blender/src/buttons_logic.c
    branches/ge_dome/source/blender/src/buttons_object.c
    branches/ge_dome/source/blender/src/buttons_scene.c
    branches/ge_dome/source/blender/src/buttons_shading.c
    branches/ge_dome/source/blender/src/drawgpencil.c
    branches/ge_dome/source/blender/src/drawobject.c
    branches/ge_dome/source/blender/src/drawview.c
    branches/ge_dome/source/blender/src/editarmature.c
    branches/ge_dome/source/blender/src/editarmature_generate.c
    branches/ge_dome/source/blender/src/editarmature_sketch.c
    branches/ge_dome/source/blender/src/editconstraint.c
    branches/ge_dome/source/blender/src/editfont.c
    branches/ge_dome/source/blender/src/editmesh_tools.c
    branches/ge_dome/source/blender/src/editnla.c
    branches/ge_dome/source/blender/src/editnode.c
    branches/ge_dome/source/blender/src/editobject.c
    branches/ge_dome/source/blender/src/editseq.c
    branches/ge_dome/source/blender/src/filesel.c
    branches/ge_dome/source/blender/src/ghostwinlay.c
    branches/ge_dome/source/blender/src/gpencil.c
    branches/ge_dome/source/blender/src/header_info.c
    branches/ge_dome/source/blender/src/header_node.c
    branches/ge_dome/source/blender/src/header_text.c
    branches/ge_dome/source/blender/src/header_view3d.c
    branches/ge_dome/source/blender/src/imagepaint.c
    branches/ge_dome/source/blender/src/meshtools.c
    branches/ge_dome/source/blender/src/parametrizer.c
    branches/ge_dome/source/blender/src/parametrizer.h
    branches/ge_dome/source/blender/src/poseobject.c
    branches/ge_dome/source/blender/src/previewrender.c
    branches/ge_dome/source/blender/src/reeb.c
    branches/ge_dome/source/blender/src/sequence.c
    branches/ge_dome/source/blender/src/space.c
    branches/ge_dome/source/blender/src/transform_conversions.c
    branches/ge_dome/source/blender/src/unwrapper.c
    branches/ge_dome/source/creator/CMakeLists.txt
    branches/ge_dome/source/creator/SConscript
    branches/ge_dome/source/creator/buildinfo.c
    branches/ge_dome/source/creator/creator.c
    branches/ge_dome/source/darwin/Makefile
    branches/ge_dome/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/ge_dome/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp
    branches/ge_dome/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/ge_dome/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/ge_dome/source/gameengine/Converter/BL_ActionActuator.h
    branches/ge_dome/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/ge_dome/source/gameengine/Converter/BL_ArmatureObject.h
    branches/ge_dome/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/ge_dome/source/gameengine/Converter/BL_DeformableGameObject.cpp
    branches/ge_dome/source/gameengine/Converter/BL_DeformableGameObject.h
    branches/ge_dome/source/gameengine/Converter/BL_MeshDeformer.cpp
    branches/ge_dome/source/gameengine/Converter/BL_MeshDeformer.h
    branches/ge_dome/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/ge_dome/source/gameengine/Converter/BL_ShapeActionActuator.h
    branches/ge_dome/source/gameengine/Converter/BL_ShapeDeformer.cpp
    branches/ge_dome/source/gameengine/Converter/BL_ShapeDeformer.h
    branches/ge_dome/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/ge_dome/source/gameengine/Converter/BL_SkinDeformer.h
    branches/ge_dome/source/gameengine/Converter/BL_SkinMeshObject.cpp
    branches/ge_dome/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/ge_dome/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/ge_dome/source/gameengine/Converter/KX_ConvertActuators.h
    branches/ge_dome/source/gameengine/Converter/KX_ConvertControllers.cpp
    branches/ge_dome/source/gameengine/Converter/KX_ConvertControllers.h
    branches/ge_dome/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/ge_dome/source/gameengine/Converter/KX_ConvertSensors.h
    branches/ge_dome/source/gameengine/Expressions/BoolValue.cpp
    branches/ge_dome/source/gameengine/Expressions/BoolValue.h
    branches/ge_dome/source/gameengine/Expressions/CMakeLists.txt
    branches/ge_dome/source/gameengine/Expressions/ConstExpr.cpp
    branches/ge_dome/source/gameengine/Expressions/ConstExpr.h
    branches/ge_dome/source/gameengine/Expressions/EmptyValue.cpp
    branches/ge_dome/source/gameengine/Expressions/EmptyValue.h
    branches/ge_dome/source/gameengine/Expressions/ErrorValue.cpp
    branches/ge_dome/source/gameengine/Expressions/ErrorValue.h
    branches/ge_dome/source/gameengine/Expressions/FloatValue.cpp
    branches/ge_dome/source/gameengine/Expressions/FloatValue.h
    branches/ge_dome/source/gameengine/Expressions/IfExpr.cpp
    branches/ge_dome/source/gameengine/Expressions/InputParser.cpp
    branches/ge_dome/source/gameengine/Expressions/InputParser.h
    branches/ge_dome/source/gameengine/Expressions/IntValue.cpp
    branches/ge_dome/source/gameengine/Expressions/IntValue.h
    branches/ge_dome/source/gameengine/Expressions/ListValue.cpp
    branches/ge_dome/source/gameengine/Expressions/ListValue.h
    branches/ge_dome/source/gameengine/Expressions/Makefile
    branches/ge_dome/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/ge_dome/source/gameengine/Expressions/PyObjectPlus.h
    branches/ge_dome/source/gameengine/Expressions/SConscript
    branches/ge_dome/source/gameengine/Expressions/StringValue.cpp
    branches/ge_dome/source/gameengine/Expressions/StringValue.h
    branches/ge_dome/source/gameengine/Expressions/Value.cpp
    branches/ge_dome/source/gameengine/Expressions/Value.h
    branches/ge_dome/source/gameengine/Expressions/VectorValue.cpp
    branches/ge_dome/source/gameengine/Expressions/VectorValue.h
    branches/ge_dome/source/gameengine/Expressions/VoidValue.h
    branches/ge_dome/source/gameengine/GameLogic/CMakeLists.txt
    branches/ge_dome/source/gameengine/GameLogic/Joystick/Makefile
    branches/ge_dome/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
    branches/ge_dome/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
    branches/ge_dome/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h
    branches/ge_dome/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
    branches/ge_dome/source/gameengine/GameLogic/Makefile
    branches/ge_dome/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_2DFilterActuator.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_ANDController.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_ANDController.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_ActuatorSensor.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_AlwaysEventManager.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_AlwaysSensor.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_DelaySensor.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_DelaySensor.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_EventManager.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_EventManager.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_ExpressionController.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_ExpressionController.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_IActuator.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_IActuator.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_IController.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_IController.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_ILogicBrick.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_IObject.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_IObject.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_IScene.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_IScene.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_ISensor.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_JoystickManager.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_JoystickSensor.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_KeyboardManager.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_KeyboardSensor.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_LogicManager.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_LogicManager.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_MouseManager.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_MouseSensor.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_NANDController.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_NANDController.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_NORController.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_NORController.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_ORController.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_ORController.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_PropertyActuator.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_PropertyEventManager.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_PropertySensor.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_PropertySensor.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_PythonController.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_RandomActuator.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_RandomEventManager.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_RandomSensor.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_RandomSensor.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_TimeEventManager.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_XNORController.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_XNORController.h
    branches/ge_dome/source/gameengine/GameLogic/SCA_XORController.cpp
    branches/ge_dome/source/gameengine/GameLogic/SCA_XORController.h
    branches/ge_dome/source/gameengine/GameLogic/SConscript
    branches/ge_dome/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
    branches/ge_dome/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp
    branches/ge_dome/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/ge_dome/source/gameengine/GamePlayer/common/windows/Makefile
    branches/ge_dome/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/ge_dome/source/gameengine/GamePlayer/ghost/GPG_Application.h
    branches/ge_dome/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/ge_dome/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
    branches/ge_dome/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/ge_dome/source/gameengine/Ketsji/BL_BlenderShader.h
    branches/ge_dome/source/gameengine/Ketsji/BL_Material.cpp
    branches/ge_dome/source/gameengine/Ketsji/BL_Material.h
    branches/ge_dome/source/gameengine/Ketsji/BL_Shader.cpp
    branches/ge_dome/source/gameengine/Ketsji/BL_Shader.h
    branches/ge_dome/source/gameengine/Ketsji/CMakeLists.txt
    branches/ge_dome/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
    branches/ge_dome/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp
    branches/ge_dome/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
    branches/ge_dome/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
    branches/ge_dome/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
    branches/ge_dome/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
    branches/ge_dome/source/gameengine/Ketsji/KXNetwork/Makefile
    branches/ge_dome/source/gameengine/Ketsji/KXNetwork/SConscript
    branches/ge_dome/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/ge_dome/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_BulletPhysicsController.h
    branches/ge_dome/source/gameengine/Ketsji/KX_CDActuator.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_CDActuator.h
    branches/ge_dome/source/gameengine/Ketsji/KX_Camera.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_Camera.h
    branches/ge_dome/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_CameraActuator.h
    branches/ge_dome/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_ConstraintActuator.h
    branches/ge_dome/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_ConstraintWrapper.h
    branches/ge_dome/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
    branches/ge_dome/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_Dome.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_Dome.h
    branches/ge_dome/source/gameengine/Ketsji/KX_GameActuator.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_GameActuator.h
    branches/ge_dome/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_GameObject.h
    branches/ge_dome/source/gameengine/Ketsji/KX_IPhysicsController.h
    branches/ge_dome/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_IpoActuator.h
    branches/ge_dome/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/ge_dome/source/gameengine/Ketsji/KX_Light.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_Light.h
    branches/ge_dome/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_MeshProxy.h
    branches/ge_dome/source/gameengine/Ketsji/KX_MotionState.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_MotionState.h
    branches/ge_dome/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_MouseFocusSensor.h
    branches/ge_dome/source/gameengine/Ketsji/KX_NearSensor.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_NearSensor.h
    branches/ge_dome/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_ObjectActuator.h
    branches/ge_dome/source/gameengine/Ketsji/KX_OdePhysicsController.h
    branches/ge_dome/source/gameengine/Ketsji/KX_ParentActuator.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_ParentActuator.h
    branches/ge_dome/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
    branches/ge_dome/source/gameengine/Ketsji/KX_PolyProxy.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_PolyProxy.h
    branches/ge_dome/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_PolygonMaterial.h
    branches/ge_dome/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_PyMath.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_PyMath.h
    branches/ge_dome/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_PythonInit.h
    branches/ge_dome/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_PythonInitTypes.h
    branches/ge_dome/source/gameengine/Ketsji/KX_RadarSensor.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_RadarSensor.h
    branches/ge_dome/source/gameengine/Ketsji/KX_RayCast.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_RayEventManager.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_RaySensor.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_RaySensor.h
    branches/ge_dome/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
    branches/ge_dome/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
    branches/ge_dome/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
    branches/ge_dome/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
    branches/ge_dome/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
    branches/ge_dome/source/gameengine/Ketsji/KX_SG_NodeRelationships.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
    branches/ge_dome/source/gameengine/Ketsji/KX_Scene.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_Scene.h
    branches/ge_dome/source/gameengine/Ketsji/KX_SceneActuator.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_SceneActuator.h
    branches/ge_dome/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_SoundActuator.h
    branches/ge_dome/source/gameengine/Ketsji/KX_StateActuator.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_StateActuator.h
    branches/ge_dome/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_SumoPhysicsController.h
    branches/ge_dome/source/gameengine/Ketsji/KX_TouchEventManager.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_TouchSensor.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_TouchSensor.h
    branches/ge_dome/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_TrackToActuator.h
    branches/ge_dome/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_VehicleWrapper.h
    branches/ge_dome/source/gameengine/Ketsji/KX_VertexProxy.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_VertexProxy.h
    branches/ge_dome/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_VisibilityActuator.h
    branches/ge_dome/source/gameengine/Ketsji/SConscript
    branches/ge_dome/source/gameengine/Network/NG_NetworkScene.cpp
    branches/ge_dome/source/gameengine/Network/NG_NetworkScene.h
    branches/ge_dome/source/gameengine/Physics/BlOde/OdePhysicsController.h
    branches/ge_dome/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp
    branches/ge_dome/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.h
    branches/ge_dome/source/gameengine/Physics/Bullet/CMakeLists.txt
    branches/ge_dome/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/ge_dome/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/ge_dome/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/ge_dome/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/ge_dome/source/gameengine/Physics/Bullet/Makefile
    branches/ge_dome/source/gameengine/Physics/Bullet/SConscript
    branches/ge_dome/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
    branches/ge_dome/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
    branches/ge_dome/source/gameengine/Physics/Sumo/SumoPhysicsController.h
    branches/ge_dome/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
    branches/ge_dome/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h
    branches/ge_dome/source/gameengine/Physics/common/CMakeLists.txt
    branches/ge_dome/source/gameengine/Physics/common/PHY_DynamicTypes.h
    branches/ge_dome/source/gameengine/Physics/common/PHY_IMotionState.h
    branches/ge_dome/source/gameengine/Physics/common/PHY_IPhysicsController.h
    branches/ge_dome/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
    branches/ge_dome/source/gameengine/Physics/common/PHY_Pro.h
    branches/ge_dome/source/gameengine/Physics/common/SConscript
    branches/ge_dome/source/gameengine/PyDoc/BL_ActionActuator.py
    branches/ge_dome/source/gameengine/PyDoc/BL_ShapeActionActuator.py
    branches/ge_dome/source/gameengine/PyDoc/GameKeys.py
    branches/ge_dome/source/gameengine/PyDoc/GameLogic.py
    branches/ge_dome/source/gameengine/PyDoc/KX_CDActuator.py
    branches/ge_dome/source/gameengine/PyDoc/KX_Camera.py
    branches/ge_dome/source/gameengine/PyDoc/KX_ConstraintActuator.py
    branches/ge_dome/source/gameengine/PyDoc/KX_GameActuator.py
    branches/ge_dome/source/gameengine/PyDoc/KX_GameObject.py
    branches/ge_dome/source/gameengine/PyDoc/KX_MeshProxy.py
    branches/ge_dome/source/gameengine/PyDoc/KX_MouseFocusSensor.py
    branches/ge_dome/source/gameengine/PyDoc/KX_ParentActuator.py
    branches/ge_dome/source/gameengine/PyDoc/KX_PolyProxy.py
    branches/ge_dome/source/gameengine/PyDoc/KX_SCA_AddObjectActuator.py
    branches/ge_dome/source/gameengine/PyDoc/KX_SCA_DynamicActuator.py
    branches/ge_dome/source/gameengine/PyDoc/KX_SCA_ReplaceMeshActuator.py
    branches/ge_dome/source/gameengine/PyDoc/KX_Scene.py
    branches/ge_dome/source/gameengine/PyDoc/KX_SceneActuator.py
    branches/ge_dome/source/gameengine/PyDoc/KX_SoundActuator.py
    branches/ge_dome/source/gameengine/PyDoc/KX_StateActuator.py
    branches/ge_dome/source/gameengine/PyDoc/KX_TouchSensor.py
    branches/ge_dome/source/gameengine/PyDoc/KX_TrackToActuator.py
    branches/ge_dome/source/gameengine/PyDoc/KX_VertexProxy.py
    branches/ge_dome/source/gameengine/PyDoc/KX_VisibilityActuator.py
    branches/ge_dome/source/gameengine/PyDoc/Rasterizer.py
    branches/ge_dome/source/gameengine/PyDoc/SCA_IController.py
    branches/ge_dome/source/gameengine/PyDoc/SCA_ILogicBrick.py
    branches/ge_dome/source/gameengine/PyDoc/SCA_ISensor.py
    branches/ge_dome/source/gameengine/PyDoc/SCA_JoystickSensor.py
    branches/ge_dome/source/gameengine/PyDoc/SCA_KeyboardSensor.py
    branches/ge_dome/source/gameengine/PyDoc/SCA_MouseSensor.py
    branches/ge_dome/source/gameengine/PyDoc/SCA_PythonController.py
    branches/ge_dome/source/gameengine/PyDoc/SCA_RandomSensor.py
    branches/ge_dome/source/gameengine/PyDoc/SConscript
    branches/ge_dome/source/gameengine/PyDoc/WhatsNew.py
    branches/ge_dome/source/gameengine/PyDoc/epy_docgen.sh
    branches/ge_dome/source/gameengine/Rasterizer/CMakeLists.txt
    branches/ge_dome/source/gameengine/Rasterizer/Makefile
    branches/ge_dome/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/ge_dome/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    branches/ge_dome/source/gameengine/Rasterizer/RAS_BucketManager.h
    branches/ge_dome/source/gameengine/Rasterizer/RAS_CameraData.h
    branches/ge_dome/source/gameengine/Rasterizer/RAS_Deformer.h
    branches/ge_dome/source/gameengine/Rasterizer/RAS_FramingManager.cpp
    branches/ge_dome/source/gameengine/Rasterizer/RAS_FramingManager.h
    branches/ge_dome/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
    branches/ge_dome/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/ge_dome/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/ge_dome/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
    branches/ge_dome/source/gameengine/Rasterizer/RAS_MaterialBucket.h
    branches/ge_dome/source/gameengine/Rasterizer/RAS_MeshObject.cpp
    branches/ge_dome/source/gameengine/Rasterizer/RAS_MeshObject.h
    branches/ge_dome/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    branches/ge_dome/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
    branches/ge_dome/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
    branches/ge_dome/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
    branches/ge_dome/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/ge_dome/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/ge_dome/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
    branches/ge_dome/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
    branches/ge_dome/source/gameengine/Rasterizer/RAS_Polygon.cpp
    branches/ge_dome/source/gameengine/Rasterizer/RAS_Polygon.h
    branches/ge_dome/source/gameengine/Rasterizer/RAS_TexVert.cpp
    branches/ge_dome/source/gameengine/Rasterizer/SConscript
    branches/ge_dome/source/gameengine/SceneGraph/SG_BBox.cpp
    branches/ge_dome/source/gameengine/SceneGraph/SG_BBox.h
    branches/ge_dome/source/gameengine/SceneGraph/SG_IObject.cpp
    branches/ge_dome/source/gameengine/SceneGraph/SG_IObject.h
    branches/ge_dome/source/gameengine/SceneGraph/SG_Node.cpp
    branches/ge_dome/source/gameengine/SceneGraph/SG_Node.h
    branches/ge_dome/source/gameengine/SceneGraph/SG_ParentRelation.h
    branches/ge_dome/source/gameengine/SceneGraph/SG_Spatial.cpp
    branches/ge_dome/source/gameengine/SceneGraph/SG_Spatial.h
    branches/ge_dome/source/gameengine/VideoTexture/BlendType.h
    branches/ge_dome/source/gameengine/VideoTexture/FilterBlueScreen.cpp
    branches/ge_dome/source/gameengine/VideoTexture/FilterColor.cpp
    branches/ge_dome/source/gameengine/VideoTexture/FilterNormal.cpp
    branches/ge_dome/source/gameengine/VideoTexture/FilterSource.cpp
    branches/ge_dome/source/gameengine/VideoTexture/FilterSource.h
    branches/ge_dome/source/gameengine/VideoTexture/ImageBuff.cpp
    branches/ge_dome/source/gameengine/VideoTexture/ImageMix.cpp
    branches/ge_dome/source/gameengine/VideoTexture/ImageRender.cpp
    branches/ge_dome/source/gameengine/VideoTexture/ImageViewport.cpp
    branches/ge_dome/source/gameengine/VideoTexture/Texture.cpp
    branches/ge_dome/source/gameengine/VideoTexture/VideoBase.cpp
    branches/ge_dome/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/ge_dome/source/gameengine/VideoTexture/blendVideoTex.cpp
    branches/ge_dome/source/kernel/gen_system/GEN_HashedPtr.cpp
    branches/ge_dome/source/nan_definitions.mk
    branches/ge_dome/tools/Blender.py
    branches/ge_dome/tools/btools.py

Added Paths:
-----------
    branches/ge_dome/release/scripts/image_2d_cutout.py
    branches/ge_dome/release/scripts/object_active_to_other.py
    branches/ge_dome/release/scripts/wizard_bolt_factory.py
    branches/ge_dome/release/scripts/wizard_landscape_ant.py
    branches/ge_dome/release/windows/extra/python26.zip
    branches/ge_dome/source/blender/python/api2_2x/bpy_internal_import.c
    branches/ge_dome/source/blender/python/api2_2x/bpy_internal_import.h
    branches/ge_dome/source/gameengine/Converter/BL_ModifierDeformer.cpp
    branches/ge_dome/source/gameengine/Converter/BL_ModifierDeformer.h
    branches/ge_dome/source/gameengine/Ketsji/KX_PythonSeq.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_PythonSeq.h
    branches/ge_dome/source/gameengine/Physics/Bullet/CcdGraphicController.cpp
    branches/ge_dome/source/gameengine/Physics/Bullet/CcdGraphicController.h
    branches/ge_dome/source/gameengine/Physics/common/PHY_IController.cpp
    branches/ge_dome/source/gameengine/Physics/common/PHY_IController.h
    branches/ge_dome/source/gameengine/Physics/common/PHY_IGraphicController.cpp
    branches/ge_dome/source/gameengine/Physics/common/PHY_IGraphicController.h
    branches/ge_dome/source/gameengine/PyDoc/BL_Shader.py
    branches/ge_dome/source/gameengine/PyDoc/CListValue.py
    branches/ge_dome/source/gameengine/PyDoc/CPropValue.py
    branches/ge_dome/source/gameengine/PyDoc/CValue.py
    branches/ge_dome/source/gameengine/PyDoc/GameTypes.py
    branches/ge_dome/source/gameengine/PyDoc/KX_BlenderMaterial.py
    branches/ge_dome/source/gameengine/PyDoc/KX_ConstraintWrapper.py
    branches/ge_dome/source/gameengine/PyDoc/KX_LightObject.py
    branches/ge_dome/source/gameengine/PyDoc/KX_PhysicsObjectWrapper.py
    branches/ge_dome/source/gameengine/PyDoc/KX_VehicleWrapper.py
    branches/ge_dome/source/gameengine/PyDoc/PyObjectPlus.py
    branches/ge_dome/source/gameengine/PyDoc/SCA_2DFilterActuator.py
    branches/ge_dome/source/gameengine/PyDoc/SCA_ActuatorSensor.py
    branches/ge_dome/source/gameengine/PyDoc/SCA_IObject.py
    branches/ge_dome/source/gameengine/PyDoc/SCA_NANDController.py
    branches/ge_dome/source/gameengine/PyDoc/SCA_NORController.py
    branches/ge_dome/source/gameengine/PyDoc/SCA_XNORController.py
    branches/ge_dome/source/gameengine/PyDoc/SCA_XORController.py
    branches/ge_dome/source/gameengine/PyDoc/bge_api_validate_py.txt
    branches/ge_dome/source/gameengine/SceneGraph/SG_DList.h
    branches/ge_dome/source/gameengine/SceneGraph/SG_QList.h

Removed Paths:
-------------
    branches/ge_dome/release/scripts/xfig_export.py
    branches/ge_dome/source/blender/python/api2_2x/point.c
    branches/ge_dome/source/blender/python/api2_2x/point.h
    branches/ge_dome/source/gameengine/Ketsji/KX_CameraActuator.cpp.bras
    branches/ge_dome/source/gameengine/PyDoc/KX_ActuatorSensor.py
    branches/ge_dome/source/gameengine/PyDoc/KX_Light.py

Property Changed:
----------------
    branches/ge_dome/release/scripts/mesh_poly_reduce_grid.py
    branches/ge_dome/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_PythonInitTypes.h

Modified: branches/ge_dome/CMakeLists.txt
===================================================================
--- branches/ge_dome/CMakeLists.txt	2009-05-11 17:34:31 UTC (rev 20158)
+++ branches/ge_dome/CMakeLists.txt	2009-05-11 18:26:47 UTC (rev 20159)
@@ -285,7 +285,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)

Modified: branches/ge_dome/Makefile
===================================================================
--- branches/ge_dome/Makefile	2009-05-11 17:34:31 UTC (rev 20158)
+++ branches/ge_dome/Makefile	2009-05-11 18:26:47 UTC (rev 20159)
@@ -1,3 +1,5 @@
+# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
+# vim: tabstop=8
 # $Id$
 #
 # ***** BEGIN GPL LICENSE BLOCK *****
@@ -31,12 +33,11 @@
 # If the user wants to override some of the build
 # vars they can put it in the file user-def.mk which
 # will get included if it exists (please do not commit
-# user-def.mk to cvs).
-
+# user-def.mk to the revision control server).
 sinclude user-def.mk
 
-# To build without openAL, uncomment the following line, or set it as
-# an environment variable, or put it uncommented in user-def.mk:
+# To build without openAL, set it as an environment variable,
+# or put it uncommented in user-def.mk:
 # export NAN_NO_OPENAL=true
 
 export NANBLENDERHOME=$(shell pwd)
@@ -44,15 +45,11 @@
 
 SOURCEDIR = 
 ifeq ($(FREE_WINDOWS),true)
-    DIRS ?= dlltool extern intern source
+    DIRS ?= dlltool extern intern source po
+else
+    DIRS ?= extern intern source po
 endif
 
-DIRS ?= extern intern source
-
-ifneq ($(INTERNATIONAL),false)
-    DIRS += po
-endif
-
 include source/nan_subdirs.mk
 
 .PHONY: release

Modified: branches/ge_dome/SConstruct
===================================================================
--- branches/ge_dome/SConstruct	2009-05-11 17:34:31 UTC (rev 20158)
+++ branches/ge_dome/SConstruct	2009-05-11 18:26:47 UTC (rev 20159)
@@ -262,29 +262,35 @@
 	env['WITH_BF_GAMEENGINE'] = False
 
 if 'blenderlite' in B.targets:
-	env['WITH_BF_GAMEENGINE'] = False
-	env['WITH_BF_OPENAL'] = False
-	env['WITH_BF_OPENEXR'] = False
-	env['WITH_BF_ICONV'] = False
-	env['WITH_BF_INTERNATIONAL'] = False
-	env['WITH_BF_OPENJPEG'] = False
-	env['WITH_BF_FFMPEG'] = False
-	env['WITH_BF_QUICKTIME'] = False
-	env['WITH_BF_YAFRAY'] = False
-	env['WITH_BF_REDCODE'] = False
-	env['WITH_BF_FTGL'] = False
-	env['WITH_BF_DDS'] = False
-	env['WITH_BF_ZLIB'] = False
-	env['WITH_BF_SDL'] = False
-	env['WITH_BF_JPEG'] = False
-	env['WITH_BF_PNG'] = False
-	env['WITH_BF_ODE'] = False
-	env['WITH_BF_BULLET'] = False
-	env['WITH_BF_SOLID'] = False
-	env['WITH_BF_BINRELOC'] = False
-	env['BF_BUILDINFO'] = False
-	env['BF_NO_ELBEEM'] = True
-	env['WITH_BF_PYTHON'] = False
+	target_env_defs = {}
+	target_env_defs['WITH_BF_GAMEENGINE'] = False
+	target_env_defs['WITH_BF_OPENAL'] = False
+	target_env_defs['WITH_BF_OPENEXR'] = False
+	target_env_defs['WITH_BF_ICONV'] = False
+	target_env_defs['WITH_BF_INTERNATIONAL'] = False
+	target_env_defs['WITH_BF_OPENJPEG'] = False
+	target_env_defs['WITH_BF_FFMPEG'] = False
+	target_env_defs['WITH_BF_QUICKTIME'] = False
+	target_env_defs['WITH_BF_YAFRAY'] = False
+	target_env_defs['WITH_BF_REDCODE'] = False
+	target_env_defs['WITH_BF_FTGL'] = False
+	target_env_defs['WITH_BF_DDS'] = False
+	target_env_defs['WITH_BF_ZLIB'] = False
+	target_env_defs['WITH_BF_SDL'] = False
+	target_env_defs['WITH_BF_JPEG'] = False
+	target_env_defs['WITH_BF_PNG'] = False
+	target_env_defs['WITH_BF_ODE'] = False
+	target_env_defs['WITH_BF_BULLET'] = False
+	target_env_defs['WITH_BF_SOLID'] = False
+	target_env_defs['WITH_BF_BINRELOC'] = False
+	target_env_defs['BF_BUILDINFO'] = False
+	target_env_defs['BF_NO_ELBEEM'] = True
+	target_env_defs['WITH_BF_PYTHON'] = False
+	
+	# Merge blenderlite, let command line to override
+	for k,v in target_env_defs.iteritems():
+		if k not in B.arguments:
+			env[k] = v
 
 # lastly we check for root_build_dir ( we should not do before, otherwise we might do wrong builddir
 #B.root_build_dir = B.arguments.get('BF_BUILDDIR', '..'+os.sep+'build'+os.sep+platform+os.sep)
@@ -548,7 +554,9 @@
 	if env['WITH_BF_SDL']:
 		dllsources.append('${BF_SDL_LIBPATH}/SDL.dll')
 	if env['WITH_BF_PYTHON']:
-		dllsources.append('#release/windows/extra/python25.zip')
+		ver = env["BF_PYTHON_VERSION"].replace(".", "")
+		
+		dllsources.append('#release/windows/extra/python' + ver + '.zip')
 		dllsources.append('#release/windows/extra/zlib.pyd')
 		if env['BF_DEBUG']:
 			dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_LIB}_d.dll')
@@ -608,6 +616,13 @@
 
 #------------ EPYDOC
 if env['WITH_BF_DOCS']:
-	SConscript('source/blender/python/api2_2x/doc/SConscript')
-	SConscript('source/gameengine/PyDoc/SConscript')
+	try:		import epydoc
+	except:	epydoc = None
+	
+	if epydoc:
+		SConscript('source/blender/python/api2_2x/doc/SConscript')
+		SConscript('source/gameengine/PyDoc/SConscript')
+	else:
+		print "No epydoc install detected, Python API and Gameengine API Docs will not be generated "
+	
 

Modified: branches/ge_dome/config/linux2-config.py
===================================================================
--- branches/ge_dome/config/linux2-config.py	2009-05-11 17:34:31 UTC (rev 20158)
+++ branches/ge_dome/config/linux2-config.py	2009-05-11 18:26:47 UTC (rev 20159)
@@ -4,8 +4,16 @@
 WITH_BF_VERSE = False
 BF_VERSE_INCLUDE = "#extern/verse/dist"
 
+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_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}'
@@ -78,7 +86,8 @@
 BF_FTGL_INC = '${BF_FTGL}/include'
 BF_FTGL_LIB = 'extern_ftgl'
 
-WITH_BF_GAMEENGINE=False
+WITH_BF_GAMEENGINE = True
+WITH_BF_PLAYER = True
 
 WITH_BF_ODE = False
 BF_ODE = LIBDIR + '/ode'

Modified: branches/ge_dome/dlltool/Makefile
===================================================================
--- branches/ge_dome/dlltool/Makefile	2009-05-11 17:34:31 UTC (rev 20158)
+++ branches/ge_dome/dlltool/Makefile	2009-05-11 18:26:47 UTC (rev 20159)
@@ -1,7 +1,5 @@
 include nan_definitions.mk
 
-PYTHONDLL=python$(subst .,,$(NAN_PYTHON_VERSION)).dll
-
 all: ${NAN_GETTEXT}/lib/freegettext.a  ${NAN_ICONV}/lib/freeiconv.a \
 		${NAN_PYTHON}/lib/freepy.a
 
@@ -24,15 +22,6 @@
 	ranlib ${NAN_ICONV}/lib/freeiconv.a
 	rm ./iconv.dll
 
-${NAN_PYTHON}/lib/freepy.a: python.def ${NAN_PYTHON}/lib/$(PYTHONDLL)
-	cp ${NAN_PYTHON}/lib/$(PYTHONDLL) .
-	sed s/PYTHON22\.DLL/$(PYTHONDLL)/ python.def > $(PYTHONDLL).def
-	dlltool.exe -v --output-lib ${NAN_PYTHON}/lib/freepy.a \
-		--input-def $(PYTHONDLL).def \
-		--dllname $(PYTHONDLL)
-	ranlib ${NAN_PYTHON}/lib/freepy.a
-	rm ./$(PYTHONDLL)
-
 clean:
-	$(RM) ${NAN_PYTHON}/lib/freepy.a ${NAN_GETTEXT}/lib/freegettext.a \
+	$(RM) ${NAN_GETTEXT}/lib/freegettext.a \
 		${NAN_ICONV}/lib/freeiconv.a

Modified: branches/ge_dome/extern/Makefile
===================================================================
--- branches/ge_dome/extern/Makefile	2009-05-11 17:34:31 UTC (rev 20158)
+++ branches/ge_dome/extern/Makefile	2009-05-11 18:26:47 UTC (rev 20159)
@@ -49,9 +49,10 @@
    DIRS += verse
 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/ge_dome/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
===================================================================
--- branches/ge_dome/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp	2009-05-11 17:34:31 UTC (rev 20158)
+++ branches/ge_dome/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp	2009-05-11 18:26:47 UTC (rev 20159)
@@ -350,13 +350,14 @@
 		for (int i=0;i<clampedSimulationSteps;i++)
 		{
 			internalSingleStepSimulation(fixedTimeStep);
-			synchronizeMotionStates();
+			//for Blender, no need to synchronize here, it is done in blender anyway
+			//synchronizeMotionStates();
 		}
 
 	} 
+	//else
+	//	synchronizeMotionStates();
 
-	synchronizeMotionStates();
-
 	clearForces();
 
 #ifndef BT_NO_PROFILE
@@ -725,9 +726,13 @@
 			{
 				if (colObj0->isActive() || colObj1->isActive())
 				{
-
-					getSimulationIslandManager()->getUnionFind().unite((colObj0)->getIslandTag(),
-						(colObj1)->getIslandTag());
+					if ((colObj0)->getIslandTag() != -1 && (colObj1)->getIslandTag() != -1)
+					{
+					
+						getSimulationIslandManager()->getUnionFind().unite((colObj0)->getIslandTag(),
+							(colObj1)->getIslandTag());
+					}
+					
 				}
 			}
 		}

Modified: branches/ge_dome/extern/ffmpeg/Makefile
===================================================================
--- branches/ge_dome/extern/ffmpeg/Makefile	2009-05-11 17:34:31 UTC (rev 20158)
+++ branches/ge_dome/extern/ffmpeg/Makefile	2009-05-11 18:26:47 UTC (rev 20159)
@@ -35,7 +35,7 @@
 ALLDIRS = libavcodec libavformat libavutil libswscale libavdevice
 
 config::
-	./configure --disable-shared --enable-gpl --enable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscale --enable-pthreads --disable-yasm --disable-bzlib --disable-outdevs --disable-demuxer=alsa
+	./configure --disable-shared --enable-gpl --enable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscale --enable-pthreads --enable-yasm --disable-bzlib --disable-outdevs --disable-demuxer=alsa
 all::
 	@for i in $(ALLDIRS); do \
 	    echo "====> $(MAKE) $@ in $(SOURCEDIR)/$$i" ;\

Modified: branches/ge_dome/extern/ffmpeg/libavcodec/Makefile
===================================================================
--- branches/ge_dome/extern/ffmpeg/libavcodec/Makefile	2009-05-11 17:34:31 UTC (rev 20158)
+++ branches/ge_dome/extern/ffmpeg/libavcodec/Makefile	2009-05-11 18:26:47 UTC (rev 20159)
@@ -1,5 +1,8 @@
 include $(SUBDIR)../config.mak
 
+$(OCGDIR)/extern/ffmpeg/libavcodec/x86/%.o: $(SUBDIR)x86/%.asm
+	$(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $<
+
 NAME = avcodec
 FFLIBS = avutil
 


@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list