[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15906] branches/blender-2.47: branches/ blender-2.47

Brecht Van Lommel brechtvanlommel at pandora.be
Fri Aug 1 21:49:13 CEST 2008


Revision: 15906
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15906
Author:   blendix
Date:     2008-08-01 21:49:11 +0200 (Fri, 01 Aug 2008)

Log Message:
-----------
branches/blender-2.47

Merge over the game engine changes from trunk into 2.47. The most
user visible changes are in logic with new sensors, controllers and
actuators, the state system, shape key drivers, dupligroups, and
more. There are also new python fynctions and the alpha sorting
setting. The rest consists of refactoring, fixes and optimizations.

MSVC projectfiles might no be merged over correct, I didn't have a
way to check this.

Merge from trunk:
        Revision: 14949
        Revision: 14952
        Revision: 14960
        Revision: 15087
        Revision: 15172
        Revision: 15182
        Revision: 15213
        Revision: 15221
        Revision: 15227
        Revision: 15231
        Revision: 15249
        Revision: 15260
        Revision: 15261
        Revision: 15263
        Revision: 15264
        Revision: 15276
        Revision: 15280
        Revision: 15291
        Revision: 15306
        Revision: 15327
        Revision: 15333
        Revision: 15335
        Revision: 15336
        Revision: 15345
        Revision: 15346
        Revision: 15347
        Revision: 15348
        Revision: 15352
        Revision: 15354
        Revision: 15359
        Revision: 15367
        Revision: 15376
        Revision: 15377
        Revision: 15382
        Revision: 15387
        Revision: 15388
        Revision: 15388
        Revision: 15394
        Revision: 15395
        Revision: 15397
        Revision: 15413
        Revision: 15420
        Revision: 15421
        Revision: 15425
        Revision: 15431
        Revision: 15451
        Revision: 15477
        Revision: 15486
        Revision: 15498
        Revision: 15504
        Revision: 15517
        Revision: 15519
        Revision: 15546
        Revision: 15547
        Revision: 15592
        Revision: 15607
        Revision: 15611
        Revision: 15628
        Revision: 15638
        Revision: 15639
        Revision: 15642
        Revision: 15656
        Revision: 15660
        Revision: 15662
        Revision: 15663
        Revision: 15668
        Revision: 15693
        Revision: 15695
        Revision: 15702
        Revision: 15714
        Revision: 15723
        Revision: 15760
        Revision: 15778
        Revision: 15843
        Revision: 15855
        Revision: 15867
        Revision: 15872
        Revision: 15873
        Revision: 15874
        Revision: 15875
        Revision: 15882
        Revision: 15883
        Revision: 15884
        Revision: 15886

Modified Paths:
--------------
    branches/blender-2.47/blenderplayer/CMakeLists.txt
    branches/blender-2.47/extern/CMakeLists.txt
    branches/blender-2.47/extern/Makefile
    branches/blender-2.47/extern/SConscript
    branches/blender-2.47/extern/make/msvc_7_0/extern.sln
    branches/blender-2.47/intern/moto/include/GEN_Map.h
    branches/blender-2.47/projectfiles_vc7/blender/blender.vcproj
    branches/blender-2.47/projectfiles_vc7/blender/src/BL_src.vcproj
    branches/blender-2.47/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj
    branches/blender-2.47/projectfiles_vc7/gameengine/converter/KX_converter.vcproj
    branches/blender-2.47/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
    branches/blender-2.47/projectfiles_vc7/gameengine/gameplayer/common/GP_common.vcproj
    branches/blender-2.47/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
    branches/blender-2.47/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
    branches/blender-2.47/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj
    branches/blender-2.47/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
    branches/blender-2.47/source/Makefile
    branches/blender-2.47/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/blender-2.47/source/blender/blenkernel/BKE_action.h
    branches/blender-2.47/source/blender/blenkernel/BKE_blender.h
    branches/blender-2.47/source/blender/blenkernel/BKE_ipo.h
    branches/blender-2.47/source/blender/blenkernel/BKE_key.h
    branches/blender-2.47/source/blender/blenkernel/BKE_scene.h
    branches/blender-2.47/source/blender/blenkernel/intern/DerivedMesh.c
    branches/blender-2.47/source/blender/blenkernel/intern/action.c
    branches/blender-2.47/source/blender/blenkernel/intern/customdata.c
    branches/blender-2.47/source/blender/blenkernel/intern/key.c
    branches/blender-2.47/source/blender/blenkernel/intern/sca.c
    branches/blender-2.47/source/blender/blenloader/intern/readfile.c
    branches/blender-2.47/source/blender/blenloader/intern/writefile.c
    branches/blender-2.47/source/blender/include/BIF_butspace.h
    branches/blender-2.47/source/blender/include/BIF_interface.h
    branches/blender-2.47/source/blender/include/butspace.h
    branches/blender-2.47/source/blender/makesdna/DNA_actuator_types.h
    branches/blender-2.47/source/blender/makesdna/DNA_controller_types.h
    branches/blender-2.47/source/blender/makesdna/DNA_customdata_types.h
    branches/blender-2.47/source/blender/makesdna/DNA_meshdata_types.h
    branches/blender-2.47/source/blender/makesdna/DNA_object_types.h
    branches/blender-2.47/source/blender/makesdna/DNA_sensor_types.h
    branches/blender-2.47/source/blender/makesdna/DNA_userdef_types.h
    branches/blender-2.47/source/blender/python/api2_2x/Mathutils.c
    branches/blender-2.47/source/blender/python/api2_2x/matrix.c
    branches/blender-2.47/source/blender/render/intern/source/convertblender.c
    branches/blender-2.47/source/blender/src/CMakeLists.txt
    branches/blender-2.47/source/blender/src/Makefile
    branches/blender-2.47/source/blender/src/SConscript
    branches/blender-2.47/source/blender/src/buttons_editing.c
    branches/blender-2.47/source/blender/src/buttons_logic.c
    branches/blender-2.47/source/blender/src/drawmesh.c
    branches/blender-2.47/source/blender/src/drawview.c
    branches/blender-2.47/source/blender/src/editobject.c
    branches/blender-2.47/source/blender/src/header_view3d.c
    branches/blender-2.47/source/blender/src/interface.c
    branches/blender-2.47/source/blender/src/interface_draw.c
    branches/blender-2.47/source/blender/src/space.c
    branches/blender-2.47/source/blender/src/usiblender.c
    branches/blender-2.47/source/creator/CMakeLists.txt
    branches/blender-2.47/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/blender-2.47/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/blender-2.47/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
    branches/blender-2.47/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
    branches/blender-2.47/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/blender-2.47/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/blender-2.47/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
    branches/blender-2.47/source/gameengine/BlenderRoutines/Makefile
    branches/blender-2.47/source/gameengine/BlenderRoutines/SConscript
    branches/blender-2.47/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/blender-2.47/source/gameengine/Converter/BL_ActionActuator.h
    branches/blender-2.47/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/blender-2.47/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/blender-2.47/source/gameengine/Converter/BL_DeformableGameObject.cpp
    branches/blender-2.47/source/gameengine/Converter/BL_DeformableGameObject.h
    branches/blender-2.47/source/gameengine/Converter/BL_MeshDeformer.cpp
    branches/blender-2.47/source/gameengine/Converter/BL_MeshDeformer.h
    branches/blender-2.47/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/blender-2.47/source/gameengine/Converter/BL_SkinDeformer.h
    branches/blender-2.47/source/gameengine/Converter/BL_SkinMeshObject.cpp
    branches/blender-2.47/source/gameengine/Converter/BL_SkinMeshObject.h
    branches/blender-2.47/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/blender-2.47/source/gameengine/Converter/KX_BlenderSceneConverter.h
    branches/blender-2.47/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/blender-2.47/source/gameengine/Converter/KX_ConvertControllers.cpp
    branches/blender-2.47/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/blender-2.47/source/gameengine/Converter/KX_IpoConvert.cpp
    branches/blender-2.47/source/gameengine/Converter/KX_IpoConvert.h
    branches/blender-2.47/source/gameengine/Expressions/PyObjectPlus.h
    branches/blender-2.47/source/gameengine/Expressions/Value.cpp
    branches/blender-2.47/source/gameengine/Expressions/Value.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_2DFilterActuator.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_AlwaysEventManager.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_AlwaysSensor.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_EventManager.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_EventManager.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_IActuator.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_IActuator.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_IController.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_IController.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_ILogicBrick.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_IObject.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_IObject.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_ISensor.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_JoystickManager.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_JoystickManager.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_JoystickSensor.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_KeyboardManager.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_KeyboardManager.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_KeyboardSensor.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_LogicManager.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_LogicManager.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_MouseManager.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_MouseManager.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_MouseSensor.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_PropertyActuator.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_PropertyEventManager.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_PropertyEventManager.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_PropertySensor.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_PropertySensor.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_PythonController.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_RandomEventManager.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_RandomEventManager.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_RandomSensor.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_RandomSensor.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_TimeEventManager.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_TimeEventManager.h
    branches/blender-2.47/source/gameengine/GamePlayer/common/CMakeLists.txt
    branches/blender-2.47/source/gameengine/GamePlayer/common/GPC_Canvas.h
    branches/blender-2.47/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
    branches/blender-2.47/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/blender-2.47/source/gameengine/GamePlayer/common/GPC_RenderTools.h
    branches/blender-2.47/source/gameengine/GamePlayer/common/Makefile
    branches/blender-2.47/source/gameengine/GamePlayer/common/SConscript
    branches/blender-2.47/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/blender-2.47/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/blender-2.47/source/gameengine/GamePlayer/ghost/GPG_Application.h
    branches/blender-2.47/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/blender-2.47/source/gameengine/GamePlayer/ghost/Makefile
    branches/blender-2.47/source/gameengine/GamePlayer/ghost/SConscript
    branches/blender-2.47/source/gameengine/Ketsji/BL_Material.cpp
    branches/blender-2.47/source/gameengine/Ketsji/BL_Material.h
    branches/blender-2.47/source/gameengine/Ketsji/BL_Shader.cpp
    branches/blender-2.47/source/gameengine/Ketsji/BL_Texture.cpp
    branches/blender-2.47/source/gameengine/Ketsji/CMakeLists.txt
    branches/blender-2.47/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
    branches/blender-2.47/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_BulletPhysicsController.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_CameraActuator.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_ConstraintActuator.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_GameObject.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_IPO_SGController.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_IPO_SGController.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_IPhysicsController.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_ISceneConverter.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_IpoActuator.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_Light.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_Light.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_MaterialIpoController.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_MaterialIpoController.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_MouseFocusSensor.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_NearSensor.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_NearSensor.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_ObjectActuator.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_OdePhysicsController.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_OdePhysicsController.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_ParentActuator.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_ParentActuator.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_PolygonMaterial.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_RadarSensor.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_RayEventManager.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_RayEventManager.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_RaySensor.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_RaySensor.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_Scene.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_Scene.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_SceneActuator.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_SceneActuator.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_SumoPhysicsController.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_TouchEventManager.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_TouchEventManager.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_TouchSensor.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_TouchSensor.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_TrackToActuator.h
    branches/blender-2.47/source/gameengine/Ketsji/Makefile
    branches/blender-2.47/source/gameengine/Ketsji/SConscript
    branches/blender-2.47/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.h
    branches/blender-2.47/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/blender-2.47/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/blender-2.47/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/blender-2.47/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/blender-2.47/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
    branches/blender-2.47/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Scene.cpp
    branches/blender-2.47/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
    branches/blender-2.47/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h
    branches/blender-2.47/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
    branches/blender-2.47/source/gameengine/PyDoc/BL_ActionActuator.py
    branches/blender-2.47/source/gameengine/PyDoc/KX_ConstraintActuator.py
    branches/blender-2.47/source/gameengine/PyDoc/KX_GameObject.py
    branches/blender-2.47/source/gameengine/PyDoc/KX_IpoActuator.py
    branches/blender-2.47/source/gameengine/PyDoc/KX_ObjectActuator.py
    branches/blender-2.47/source/gameengine/PyDoc/SCA_ISensor.py
    branches/blender-2.47/source/gameengine/PyDoc/SCA_PythonController.py
    branches/blender-2.47/source/gameengine/Rasterizer/CMakeLists.txt
    branches/blender-2.47/source/gameengine/Rasterizer/Makefile
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_2DFilterManager.h
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_BucketManager.h
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_CameraData.h
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_Deformer.h
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_ICanvas.h
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_IRenderTools.h
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_MaterialBucket.h
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_MeshObject.cpp
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_MeshObject.h
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_Polygon.cpp
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_TexVert.cpp
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_TexVert.h
    branches/blender-2.47/source/gameengine/Rasterizer/SConscript
    branches/blender-2.47/source/gameengine/SceneGraph/SG_Controller.h
    branches/blender-2.47/source/gameengine/SceneGraph/SG_IObject.cpp
    branches/blender-2.47/source/gameengine/SceneGraph/SG_IObject.h
    branches/blender-2.47/source/gameengine/SceneGraph/SG_Node.cpp
    branches/blender-2.47/source/gameengine/SceneGraph/SG_Node.h
    branches/blender-2.47/source/gameengine/SceneGraph/SG_ParentRelation.h
    branches/blender-2.47/source/gameengine/SceneGraph/SG_Spatial.cpp
    branches/blender-2.47/source/gameengine/SceneGraph/SG_Spatial.h
    branches/blender-2.47/source/kernel/gen_system/GEN_HashedPtr.h
    branches/blender-2.47/source/kernel/gen_system/GEN_Map.h
    branches/blender-2.47/source/nan_definitions.mk

Added Paths:
-----------
    branches/blender-2.47/extern/glew/
    branches/blender-2.47/extern/glew/CMakeLists.txt
    branches/blender-2.47/extern/glew/ChangeLog
    branches/blender-2.47/extern/glew/README.txt
    branches/blender-2.47/extern/glew/SConscript
    branches/blender-2.47/extern/glew/doc/
    branches/blender-2.47/extern/glew/doc/advanced.html
    branches/blender-2.47/extern/glew/doc/basic.html
    branches/blender-2.47/extern/glew/doc/credits.html
    branches/blender-2.47/extern/glew/doc/glew.css
    branches/blender-2.47/extern/glew/doc/glew.html
    branches/blender-2.47/extern/glew/doc/glx.txt
    branches/blender-2.47/extern/glew/doc/glxew.html
    branches/blender-2.47/extern/glew/doc/gpl.txt
    branches/blender-2.47/extern/glew/doc/index.html
    branches/blender-2.47/extern/glew/doc/install.html
    branches/blender-2.47/extern/glew/doc/log.html
    branches/blender-2.47/extern/glew/doc/sgi.txt
    branches/blender-2.47/extern/glew/doc/wglew.html
    branches/blender-2.47/extern/glew/include/
    branches/blender-2.47/extern/glew/include/GL/
    branches/blender-2.47/extern/glew/include/GL/glew.h
    branches/blender-2.47/extern/glew/include/GL/glxew.h
    branches/blender-2.47/extern/glew/include/GL/wglew.h
    branches/blender-2.47/extern/glew/make/
    branches/blender-2.47/extern/glew/make/msvc_7_0/
    branches/blender-2.47/extern/glew/src/
    branches/blender-2.47/extern/glew/src/Makefile
    branches/blender-2.47/extern/glew/src/glew.c
    branches/blender-2.47/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/blender-2.47/source/gameengine/Converter/BL_ShapeActionActuator.h
    branches/blender-2.47/source/gameengine/Converter/BL_ShapeDeformer.cpp
    branches/blender-2.47/source/gameengine/Converter/BL_ShapeDeformer.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_ActuatorSensor.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_NANDController.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_NANDController.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_NORController.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_NORController.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_XNORController.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_XNORController.h
    branches/blender-2.47/source/gameengine/GameLogic/SCA_XORController.cpp
    branches/blender-2.47/source/gameengine/GameLogic/SCA_XORController.h
    branches/blender-2.47/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/blender-2.47/source/gameengine/Ketsji/BL_BlenderShader.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
    branches/blender-2.47/source/gameengine/Ketsji/KX_StateActuator.cpp
    branches/blender-2.47/source/gameengine/Ketsji/KX_StateActuator.h
    branches/blender-2.47/source/gameengine/PyDoc/BL_ShapeActionActuator.py
    branches/blender-2.47/source/gameengine/PyDoc/KX_ActuatorSensor.py
    branches/blender-2.47/source/gameengine/PyDoc/KX_StateActuator.py

Removed Paths:
-------------
    branches/blender-2.47/extern/glew/CMakeLists.txt
    branches/blender-2.47/extern/glew/ChangeLog
    branches/blender-2.47/extern/glew/README.txt
    branches/blender-2.47/extern/glew/SConscript
    branches/blender-2.47/extern/glew/doc/
    branches/blender-2.47/extern/glew/doc/advanced.html
    branches/blender-2.47/extern/glew/doc/basic.html
    branches/blender-2.47/extern/glew/doc/credits.html
    branches/blender-2.47/extern/glew/doc/glew.css
    branches/blender-2.47/extern/glew/doc/glew.html
    branches/blender-2.47/extern/glew/doc/glx.txt
    branches/blender-2.47/extern/glew/doc/glxew.html
    branches/blender-2.47/extern/glew/doc/gpl.txt
    branches/blender-2.47/extern/glew/doc/index.html
    branches/blender-2.47/extern/glew/doc/install.html
    branches/blender-2.47/extern/glew/doc/log.html
    branches/blender-2.47/extern/glew/doc/sgi.txt
    branches/blender-2.47/extern/glew/doc/wglew.html
    branches/blender-2.47/extern/glew/include/
    branches/blender-2.47/extern/glew/include/GL/
    branches/blender-2.47/extern/glew/include/GL/glew.h
    branches/blender-2.47/extern/glew/include/GL/glxew.h
    branches/blender-2.47/extern/glew/include/GL/wglew.h
    branches/blender-2.47/extern/glew/make/msvc_7_0/
    branches/blender-2.47/extern/glew/src/
    branches/blender-2.47/extern/glew/src/Makefile
    branches/blender-2.47/extern/glew/src/glew.c
    branches/blender-2.47/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.cpp
    branches/blender-2.47/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.h
    branches/blender-2.47/source/gameengine/BlenderRoutines/mac_compat_glext.h
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ARB_multitexture.h
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/EXT_separate_specular_color.h
    branches/blender-2.47/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/mkglext.py

Modified: branches/blender-2.47/blenderplayer/CMakeLists.txt
===================================================================
--- branches/blender-2.47/blenderplayer/CMakeLists.txt	2008-08-01 19:46:41 UTC (rev 15905)
+++ branches/blender-2.47/blenderplayer/CMakeLists.txt	2008-08-01 19:49:11 UTC (rev 15906)
@@ -108,6 +108,7 @@
     blenkernel_blc
     bf_quicktime
     extern_binreloc
+	extern_glew
   ) 
 
   FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})

Modified: branches/blender-2.47/extern/CMakeLists.txt
===================================================================
--- branches/blender-2.47/extern/CMakeLists.txt	2008-08-01 19:46:41 UTC (rev 15905)
+++ branches/blender-2.47/extern/CMakeLists.txt	2008-08-01 19:49:11 UTC (rev 15906)
@@ -43,3 +43,6 @@
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
   SUBDIRS(binreloc)
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+
+SUBDIRS(glew)
+

Modified: branches/blender-2.47/extern/Makefile
===================================================================
--- branches/blender-2.47/extern/Makefile	2008-08-01 19:46:41 UTC (rev 15905)
+++ branches/blender-2.47/extern/Makefile	2008-08-01 19:49:11 UTC (rev 15906)
@@ -30,7 +30,7 @@
 
 SOURCEDIR = extern
 DIR = $(OCGDIR)/extern
-DIRS = qhull/src solid 
+DIRS = qhull/src solid glew/src
 
 ifeq ($(WITH_FREETYPE2), true)
     DIRS += bFTGL/src

Modified: branches/blender-2.47/extern/SConscript
===================================================================
--- branches/blender-2.47/extern/SConscript	2008-08-01 19:46:41 UTC (rev 15905)
+++ branches/blender-2.47/extern/SConscript	2008-08-01 19:49:11 UTC (rev 15906)
@@ -2,6 +2,8 @@
 
 Import('env')
 
+SConscript(['glew/SConscript'])
+
 if env['WITH_BF_GAMEENGINE']:
     SConscript(['qhull/SConscript',
             'solid/SConscript'])

Copied: branches/blender-2.47/extern/glew (from rev 15249, trunk/blender/extern/glew)

Deleted: branches/blender-2.47/extern/glew/CMakeLists.txt
===================================================================
--- trunk/blender/extern/glew/CMakeLists.txt	2008-06-17 10:27:34 UTC (rev 15249)
+++ branches/blender-2.47/extern/glew/CMakeLists.txt	2008-08-01 19:49:11 UTC (rev 15906)
@@ -1,33 +0,0 @@
-# $Id$
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# The Original Code is Copyright (C) 2006, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Jacques Beaurain.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-SET(INC include src)
-
-SET(SRC
-  src/glew.c
-)
-
-BLENDERLIB(extern_glew "${SRC}" "${INC}")

Copied: branches/blender-2.47/extern/glew/CMakeLists.txt (from rev 15249, trunk/blender/extern/glew/CMakeLists.txt)
===================================================================
--- branches/blender-2.47/extern/glew/CMakeLists.txt	                        (rev 0)
+++ branches/blender-2.47/extern/glew/CMakeLists.txt	2008-08-01 19:49:11 UTC (rev 15906)
@@ -0,0 +1,33 @@
+# $Id$
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2006, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Jacques Beaurain.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+SET(INC include src)
+
+SET(SRC
+  src/glew.c
+)
+
+BLENDERLIB(extern_glew "${SRC}" "${INC}")

Deleted: branches/blender-2.47/extern/glew/ChangeLog
===================================================================
--- trunk/blender/extern/glew/ChangeLog	2008-06-17 10:27:34 UTC (rev 15249)
+++ branches/blender-2.47/extern/glew/ChangeLog	2008-08-01 19:49:11 UTC (rev 15906)
@@ -1,1703 +0,0 @@
-2005-05-16 00:35  ikits
-
-	* auto/src/template.html, doc/advanced.html, doc/basic.html,
-	  doc/credits.html, doc/index.html, doc/install.html, doc/log.html:
-	  getting ready for the release
-
-2005-05-16 00:14  ikits
-
-	* auto/Makefile: Added option for splitting the source into
-	  multiple files
-
-2005-05-16 00:13  ikits
-
-	* auto/bin/update_ext.sh: Fixed GL_ARB_transpose_matrix bug
-
-2005-04-22 18:47  ikits
-
-	* auto/: bin/update_ext.sh, core/GL_VERSION_2_0: fixed bugs 1185517
-	  and 1182116
-
-2005-04-04 23:49  ikits
-
-	* auto/src/: glew_head.c, glew_init_gl.c: fix for OGL 2.0 problem
-
-2005-03-16 21:49  ikits
-
-	* config/version: bump version number
-
-2005-03-16 21:48  ikits
-
-	* auto/src/glew_init_gl.c: minor issue
-
-2005-03-16 21:04  ikits
-
-	* doc/advanced.html, doc/basic.html, doc/credits.html,
-	  doc/index.html, doc/install.html, doc/log.html,
-	  auto/src/template.html: getting ready for the release
-
-2005-03-16 20:49  ikits
-
-	* ChangeLog: it's that time again
-
-2005-03-16 20:48  ikits
-
-	* TODO.txt: fix it when there is time
-
-2005-03-16 20:45  ikits
-
-	* auto/src/glew_init_gl.c: added check for crippled hardware
-
-2005-03-14 23:50  ikits
-
-	* auto/src/template.html: documentation update
-
-2005-03-14 23:38  ikits
-
-	* doc/log.html: update log
-
-2005-03-14 23:24  ikits
-
-	* TODO.txt: done
-
-2005-03-14 23:21  ikits
-
-	* doc/: advanced.html, basic.html, credits.html, index.html,
-	  install.html, log.html, glew.css: changes for html 4.01
-	  compliance
-
-2005-03-14 00:13  ikits
-
-	* TODO.txt: oops
-
-2005-03-14 00:10  ikits
-
-	* TODO.txt: some more
-
-2005-03-14 00:08  ikits
-
-	* TODO.txt: the road ahead
-
-2005-03-14 00:00  ikits
-
-	* config/: Makefile.mingw, Makefile.mingw32: fixed bug #1161790
-
-2005-03-13 23:09  ikits
-
-	* auto/core/: GL_APPLE_pixel_buffer, GL_EXT_framebuffer_object,
-	  GL_SGIX_shadow: cleanup and bug fixes; thanks to Stephane for
-	  these
-
-2005-02-05 02:17  ikits
-
-	* auto/core/GL_VERSION_2_0: fixed bug 1116569
-
-2005-02-03 00:25  ikits
-
-	* ChangeLog: version bump
-
-2005-02-03 00:21  ikits
-
-	* config/version: version bump
-
-2005-02-03 00:13  ikits
-
-	* doc/log.html: oops
-
-2005-02-02 23:28  ikits
-
-	* doc/index.html: added reference
-
-2005-02-02 22:49  ikits
-
-	* doc/install.html: ready for release
-
-2005-02-02 22:34  ikits
-
-	* auto/Makefile, auto/src/template.html, doc/advanced.html,
-	  doc/basic.html, doc/credits.html, doc/glew.css, doc/index.html,
-	  doc/install.html, doc/log.html: prepare for release
-
-2005-01-30 17:26  ikits
-
-	* doc/advanced.html, doc/basic.html, doc/credits.html,
-	  doc/index.html, doc/install.html, doc/log.html,
-	  auto/src/template.html: ,
-
-2005-01-30 17:12  ikits
-
-	* doc/install.html: corrected VS.NET install location
-
-2005-01-30 01:46  ikits
-
-	* auto/src/: glew.rc, glewinfo.rc, visualinfo.rc: added description
-	  fields
-
-2005-01-30 01:35  ikits
-
-	* ChangeLog, doc/log.html: update logs
-
-2005-01-29 20:48  ikits
-
-	* auto/Makefile, auto/src/glew.rc, auto/src/glewinfo.rc,
-	  auto/src/visualinfo.rc, build/vc6/glew_shared.dsp,
-	  build/vc6/glew_static.dsp, build/vc6/glewinfo.dsp,
-	  build/vc6/visualinfo.dsp: added resource files for win32
-	  versioning
-
-2005-01-29 18:39  ikits
-
-	* config/version: changed versioning to make it easier to follow
-
-2005-01-29 11:59  ikits
-
-	* auto/src/glew_head.h: fix borland compilation problem
-
-2005-01-28 23:36  ikits
-
-	* auto/bin/parse_spec.pl: fixed GLhalf bug
-
-2005-01-21 09:04  ikits
-
-	* auto/core/GL_EXT_framebuffer_object: ubercomplete
-
-2005-01-20 19:53  ikits
-
-	* auto/core/GL_VERSION_2_0: fixed bugs
-
-2005-01-11 18:03  mem
-
-	* auto/lib/OpenGL/Spec.pm: Clean up a little
-
-2005-01-11 15:40  mem
-
-	* auto/lib/OpenGL/Spec.pm: Modularized parser
-
-2005-01-06 01:53  ikits
-
-	* doc/: advanced.html, basic.html, credits.html, index.html,
-	  install.html, log.html, ogl_sm.jpg, new.png: sync up webpage and
-	  docs
-
-2005-01-06 01:26  ikits
-
-	* TODO.txt: one more item
-
-2005-01-06 01:25  ikits
-
-	* auto/bin/update_ext.sh: fixed GLhandleARB
-
-2005-01-05 15:37  mem
-
-	* config/version: Forgot to bump GLEW version
-
-2005-01-05 15:35  mem
-
-	* TODO.txt: Expanded TODO item about autoinitialization
-
-2005-01-05 15:27  mem
-
-	* ChangeLog: Added ChangeLog.  The file is generated with cvs2cl.
-
-2005-01-05 15:19  mem
-
-	* Makefile, auto/Makefile, config/Makefile.darwin,
-	  config/Makefile.freebsd, config/Makefile.irix,
-	  config/Makefile.linux, config/Makefile.solaris, config/version:
-	  Fix soname, ABI broke
-
-2005-01-04 20:55  ikits
-
-	* doc/gpl.txt: documentation update
-
-2005-01-04 20:32  ikits
-
-	* doc/index.html: documentation update
-
-2005-01-04 20:17  ikits
-
-	* doc/glew.css: documentation update
-
-2005-01-04 20:10  ikits
-
-	* auto/src/template.html, doc/README.html, doc/advanced.html,
-	  doc/basic.html, doc/credits.html, doc/index.html,
-	  doc/install.html, doc/log.html: documentation update
-
-2005-01-04 20:01  ikits
-
-	* README.txt, auto/src/template.html, doc/glew.css: documentation
-	  update
-
-2005-01-04 10:02  ikits
-
-	* auto/src/glew_head.c: bug fixes
-
-2005-01-04 01:00  ikits
-
-	* auto/src/template.html: web crap
-
-2005-01-04 00:30  ikits
-
-	* auto/: bin/make_str.pl, src/glew_head.c, src/glew_str_glx.c,
-	  src/glew_str_head.c, src/glew_str_tail.c, src/glew_str_wgl.c,
-	  src/glew_utils.c, src/glew_utils.h: extended glewIsSupported
-
-2005-01-03 23:17  ikits
-
-	* config/: Makefile.solaris, Makefile.sunos: makefile fixes
-
-2005-01-03 23:11  ikits
-

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list