[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21303] branches/soc-2009-aligorith: NLA SoC: Merge from 2.5

Joshua Leung aligorith at gmail.com
Thu Jul 2 05:32:59 CEST 2009


Revision: 21303
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21303
Author:   aligorith
Date:     2009-07-02 05:32:57 +0200 (Thu, 02 Jul 2009)

Log Message:
-----------
NLA SoC: Merge from 2.5

21210 to 21300

Note to self: the next merge will be messy again, since 2 commits occurred this one was complete

Modified Paths:
--------------
    branches/soc-2009-aligorith/CMakeLists.txt
    branches/soc-2009-aligorith/intern/string/intern/STR_String.cpp
    branches/soc-2009-aligorith/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
    branches/soc-2009-aligorith/projectfiles_vc9/blender/blender.vcproj
    branches/soc-2009-aligorith/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
    branches/soc-2009-aligorith/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
    branches/soc-2009-aligorith/projectfiles_vc9/blender/editors/ED_editors.vcproj
    branches/soc-2009-aligorith/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
    branches/soc-2009-aligorith/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
    branches/soc-2009-aligorith/projectfiles_vc9/blender/nodes/nodes.vcproj
    branches/soc-2009-aligorith/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj
    branches/soc-2009-aligorith/projectfiles_vc9/gameengine/converter/KX_converter.vcproj
    branches/soc-2009-aligorith/projectfiles_vc9/gameengine/expression/EXP_expressions.vcproj
    branches/soc-2009-aligorith/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj
    branches/soc-2009-aligorith/projectfiles_vc9/gameengine/gameplayer/axctl/GP_axctl.vcproj
    branches/soc-2009-aligorith/projectfiles_vc9/gameengine/gameplayer/common/GP_common.vcproj
    branches/soc-2009-aligorith/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
    branches/soc-2009-aligorith/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj
    branches/soc-2009-aligorith/projectfiles_vc9/gameengine/ketsji/network/KX_network.vcproj
    branches/soc-2009-aligorith/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
    branches/soc-2009-aligorith/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj
    branches/soc-2009-aligorith/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj
    branches/soc-2009-aligorith/projectfiles_vc9/kernel/system/SYS_system.vcproj
    branches/soc-2009-aligorith/release/ui/buttons_data_mesh.py
    branches/soc-2009-aligorith/release/ui/buttons_data_modifier.py
    branches/soc-2009-aligorith/release/ui/buttons_particle.py
    branches/soc-2009-aligorith/release/ui/space_buttons.py
    branches/soc-2009-aligorith/release/ui/space_image.py
    branches/soc-2009-aligorith/source/blender/blenkernel/BKE_packedFile.h
    branches/soc-2009-aligorith/source/blender/blenkernel/BKE_particle.h
    branches/soc-2009-aligorith/source/blender/blenkernel/BKE_report.h
    branches/soc-2009-aligorith/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2009-aligorith/source/blender/blenkernel/intern/context.c
    branches/soc-2009-aligorith/source/blender/blenkernel/intern/displist.c
    branches/soc-2009-aligorith/source/blender/blenkernel/intern/font.c
    branches/soc-2009-aligorith/source/blender/blenkernel/intern/image.c
    branches/soc-2009-aligorith/source/blender/blenkernel/intern/packedFile.c
    branches/soc-2009-aligorith/source/blender/blenkernel/intern/particle.c
    branches/soc-2009-aligorith/source/blender/blenkernel/intern/report.c
    branches/soc-2009-aligorith/source/blender/blenlib/BLI_util.h
    branches/soc-2009-aligorith/source/blender/blenlib/intern/storage.c
    branches/soc-2009-aligorith/source/blender/blenlib/intern/util.c
    branches/soc-2009-aligorith/source/blender/blenloader/intern/readfile.c
    branches/soc-2009-aligorith/source/blender/editors/include/ED_fileselect.h
    branches/soc-2009-aligorith/source/blender/editors/include/ED_mesh.h
    branches/soc-2009-aligorith/source/blender/editors/include/UI_interface.h
    branches/soc-2009-aligorith/source/blender/editors/interface/interface.c
    branches/soc-2009-aligorith/source/blender/editors/interface/interface_handlers.c
    branches/soc-2009-aligorith/source/blender/editors/interface/interface_icons.c
    branches/soc-2009-aligorith/source/blender/editors/interface/interface_layout.c
    branches/soc-2009-aligorith/source/blender/editors/interface/interface_panel.c
    branches/soc-2009-aligorith/source/blender/editors/interface/interface_regions.c
    branches/soc-2009-aligorith/source/blender/editors/interface/interface_templates.c
    branches/soc-2009-aligorith/source/blender/editors/interface/interface_utils.c
    branches/soc-2009-aligorith/source/blender/editors/interface/interface_widgets.c
    branches/soc-2009-aligorith/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2009-aligorith/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2009-aligorith/source/blender/editors/object/editkey.c
    branches/soc-2009-aligorith/source/blender/editors/object/object_intern.h
    branches/soc-2009-aligorith/source/blender/editors/object/object_ops.c
    branches/soc-2009-aligorith/source/blender/editors/screen/screen_ops.c
    branches/soc-2009-aligorith/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2009-aligorith/source/blender/editors/space_buttons/buttons_intern.h
    branches/soc-2009-aligorith/source/blender/editors/space_buttons/buttons_ops.c
    branches/soc-2009-aligorith/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2009-aligorith/source/blender/editors/space_file/file_draw.c
    branches/soc-2009-aligorith/source/blender/editors/space_file/file_intern.h
    branches/soc-2009-aligorith/source/blender/editors/space_file/file_ops.c
    branches/soc-2009-aligorith/source/blender/editors/space_file/filelist.c
    branches/soc-2009-aligorith/source/blender/editors/space_file/filelist.h
    branches/soc-2009-aligorith/source/blender/editors/space_file/filesel.c
    branches/soc-2009-aligorith/source/blender/editors/space_file/fsmenu.c
    branches/soc-2009-aligorith/source/blender/editors/space_file/fsmenu.h
    branches/soc-2009-aligorith/source/blender/editors/space_file/space_file.c
    branches/soc-2009-aligorith/source/blender/editors/space_image/image_buttons.c
    branches/soc-2009-aligorith/source/blender/editors/space_image/image_ops.c
    branches/soc-2009-aligorith/source/blender/editors/space_info/info_intern.h
    branches/soc-2009-aligorith/source/blender/editors/space_info/space_info.c
    branches/soc-2009-aligorith/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2009-aligorith/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/soc-2009-aligorith/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2009-aligorith/source/blender/makesdna/DNA_brush_types.h
    branches/soc-2009-aligorith/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2009-aligorith/source/blender/makesdna/DNA_screen_types.h
    branches/soc-2009-aligorith/source/blender/makesdna/DNA_space_types.h
    branches/soc-2009-aligorith/source/blender/makesdna/DNA_windowmanager_types.h
    branches/soc-2009-aligorith/source/blender/makesrna/RNA_access.h
    branches/soc-2009-aligorith/source/blender/makesrna/RNA_types.h
    branches/soc-2009-aligorith/source/blender/makesrna/intern/makesrna.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_access.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_context.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_define.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_image.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_internal_types.h
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_mesh_api.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_object.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_rna.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_screen.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_ui.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_ui_api.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2009-aligorith/source/blender/python/generic/BGL.c
    branches/soc-2009-aligorith/source/blender/python/generic/Geometry.c
    branches/soc-2009-aligorith/source/blender/python/generic/Mathutils.c
    branches/soc-2009-aligorith/source/blender/python/generic/euler.c
    branches/soc-2009-aligorith/source/blender/python/generic/euler.h
    branches/soc-2009-aligorith/source/blender/python/generic/matrix.c
    branches/soc-2009-aligorith/source/blender/python/generic/matrix.h
    branches/soc-2009-aligorith/source/blender/python/generic/quat.c
    branches/soc-2009-aligorith/source/blender/python/generic/quat.h
    branches/soc-2009-aligorith/source/blender/python/generic/vector.c
    branches/soc-2009-aligorith/source/blender/python/generic/vector.h
    branches/soc-2009-aligorith/source/blender/python/intern/bpy_operator_wrap.c
    branches/soc-2009-aligorith/source/blender/python/intern/bpy_rna.c
    branches/soc-2009-aligorith/source/blender/windowmanager/WM_api.h
    branches/soc-2009-aligorith/source/blender/windowmanager/WM_types.h
    branches/soc-2009-aligorith/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2009-aligorith/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2009-aligorith/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2009-aligorith/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2009-aligorith/source/creator/CMakeLists.txt
    branches/soc-2009-aligorith/source/gameengine/BlenderRoutines/Makefile
    branches/soc-2009-aligorith/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2009-aligorith/source/gameengine/Converter/BL_ActionActuator.h
    branches/soc-2009-aligorith/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/soc-2009-aligorith/source/gameengine/Converter/BL_ShapeActionActuator.h
    branches/soc-2009-aligorith/source/gameengine/Expressions/BoolValue.cpp
    branches/soc-2009-aligorith/source/gameengine/Expressions/IntValue.cpp
    branches/soc-2009-aligorith/source/gameengine/Expressions/ListValue.cpp
    branches/soc-2009-aligorith/source/gameengine/Expressions/ListValue.h
    branches/soc-2009-aligorith/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/soc-2009-aligorith/source/gameengine/Expressions/PyObjectPlus.h
    branches/soc-2009-aligorith/source/gameengine/Expressions/StringValue.h
    branches/soc-2009-aligorith/source/gameengine/Expressions/Value.cpp
    branches/soc-2009-aligorith/source/gameengine/Expressions/Value.h
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_2DFilterActuator.h
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_ANDController.cpp
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_ANDController.h
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_ActuatorSensor.h
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_AlwaysSensor.h
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_DelaySensor.cpp
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_DelaySensor.h
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_ExpressionController.cpp
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_ExpressionController.h
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_IActuator.cpp
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_IActuator.h
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_IController.cpp
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_IController.h
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_ILogicBrick.h
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_IObject.cpp
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_IObject.h
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_ISensor.h
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_JoystickSensor.h
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_KeyboardSensor.h
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_LogicManager.cpp
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_MouseSensor.h
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_NANDController.cpp
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_NANDController.h
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_NORController.cpp
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_NORController.h
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_ORController.cpp
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_ORController.h
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_PropertyActuator.h
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_PropertySensor.cpp
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_PropertySensor.h
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_PythonController.h
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_RandomActuator.h
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_RandomSensor.cpp
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_RandomSensor.h
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_XNORController.cpp
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_XNORController.h
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_XORController.cpp
    branches/soc-2009-aligorith/source/gameengine/GameLogic/SCA_XORController.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/BL_Shader.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/BL_Shader.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_CDActuator.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_CDActuator.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_Camera.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_Camera.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_CameraActuator.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_ConstraintActuator.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_ConstraintWrapper.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_GameActuator.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_GameActuator.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_IpoActuator.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_Light.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_Light.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_MeshProxy.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_MouseFocusSensor.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_NearSensor.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_NearSensor.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_ObjectActuator.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_ParentActuator.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_ParentActuator.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_PolyProxy.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_PolyProxy.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_PolygonMaterial.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_PyMath.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_PyMath.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_PythonSeq.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_RadarSensor.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_RadarSensor.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_RaySensor.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_RaySensor.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_Scene.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_SceneActuator.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_SceneActuator.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_SoundActuator.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_StateActuator.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_StateActuator.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_TouchSensor.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_TouchSensor.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_TrackToActuator.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_VehicleWrapper.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_VertexProxy.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_VertexProxy.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_VisibilityActuator.h
    branches/soc-2009-aligorith/source/gameengine/VideoTexture/FilterBlueScreen.cpp
    branches/soc-2009-aligorith/source/gameengine/VideoTexture/FilterColor.cpp
    branches/soc-2009-aligorith/source/gameengine/VideoTexture/FilterNormal.cpp
    branches/soc-2009-aligorith/source/gameengine/VideoTexture/ImageRender.cpp
    branches/soc-2009-aligorith/source/gameengine/VideoTexture/ImageViewport.cpp
    branches/soc-2009-aligorith/source/gameengine/VideoTexture/VideoBase.cpp
    branches/soc-2009-aligorith/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/soc-2009-aligorith/source/gameengine/VideoTexture/blendVideoTex.cpp

Added Paths:
-----------
    branches/soc-2009-aligorith/release/ui/space_filebrowser.py
    branches/soc-2009-aligorith/release/ui/space_info.py
    branches/soc-2009-aligorith/source/blender/editors/mesh/mesh_layers.c
    branches/soc-2009-aligorith/source/blender/editors/object/object_vgroup.c
    branches/soc-2009-aligorith/source/blender/editors/space_file/file_panels.c
    branches/soc-2009-aligorith/source/blender/editors/space_info/info_ops.c

Removed Paths:
-------------
    branches/soc-2009-aligorith/source/blender/editors/mesh/editdeform.c
    branches/soc-2009-aligorith/source/blender/editors/space_info/info_header.c

Modified: branches/soc-2009-aligorith/CMakeLists.txt
===================================================================
--- branches/soc-2009-aligorith/CMakeLists.txt	2009-07-02 03:05:33 UTC (rev 21302)
+++ branches/soc-2009-aligorith/CMakeLists.txt	2009-07-02 03:32:57 UTC (rev 21303)
@@ -193,10 +193,10 @@
   ENDIF(CMAKE_CL_64)
 
   SET(PYTHON ${LIBDIR}/python)
-  SET(PYTHON_VERSION 2.5)
+  SET(PYTHON_VERSION 2.6)
   SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
   SET(PYTHON_BINARY python)
-  SET(PYTHON_LIB python25)
+  SET(PYTHON_LIB python26)
   SET(PYTHON_LIBPATH ${PYTHON}/lib)
 
   IF(CMAKE_CL_64)

Modified: branches/soc-2009-aligorith/intern/string/intern/STR_String.cpp
===================================================================
--- branches/soc-2009-aligorith/intern/string/intern/STR_String.cpp	2009-07-02 03:05:33 UTC (rev 21302)
+++ branches/soc-2009-aligorith/intern/string/intern/STR_String.cpp	2009-07-02 03:32:57 UTC (rev 21303)
@@ -559,7 +559,8 @@
 {
 	int skip;
 	assertd(pData != NULL);
-	for (skip=0; isSpace(pData[skip]); skip++, Len--);
+	for (skip=0; isSpace(pData[skip]); skip++, Len--)
+		{};
 	memmove(pData, pData+skip, Len+1);
 	return *this;
 }
@@ -598,7 +599,8 @@
 {
 	int skip;
 	assertd(pData != NULL);
-	for (skip=0; Len && strchr(set, pData[skip]); skip++, Len--);
+	for (skip=0; Len && strchr(set, pData[skip]); skip++, Len--)
+		{};
 	memmove(pData, pData+skip, Len+1);
 	return *this;
 }

Modified: branches/soc-2009-aligorith/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
===================================================================
--- branches/soc-2009-aligorith/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj	2009-07-02 03:05:33 UTC (rev 21302)
+++ branches/soc-2009-aligorith/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj	2009-07-02 03:32:57 UTC (rev 21303)
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesrna;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\editors\include"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesrna;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\editors\include"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB;WITH_FFMPEG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -120,7 +120,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesrna;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\editors\include"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesrna;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\editors\include"
 				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -197,7 +197,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesrna;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\editors\include"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesrna;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\editors\include"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB;WITH_FFMPEG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -274,7 +274,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesrna;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\editors\include"

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list