[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15320] branches/soc-2008-nicholasbishop: Merge with trunk (r15316)
Nicholas Bishop
nicholasbishop at gmail.com
Sun Jun 22 23:56:52 CEST 2008
Revision: 15320
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15320
Author: nicholasbishop
Date: 2008-06-22 23:56:52 +0200 (Sun, 22 Jun 2008)
Log Message:
-----------
Merge with trunk (r15316)
Modified Paths:
--------------
branches/soc-2008-nicholasbishop/blenderplayer/CMakeLists.txt
branches/soc-2008-nicholasbishop/extern/CMakeLists.txt
branches/soc-2008-nicholasbishop/extern/Makefile
branches/soc-2008-nicholasbishop/extern/SConscript
branches/soc-2008-nicholasbishop/extern/bFTGL/SConscript
branches/soc-2008-nicholasbishop/extern/libopenjpeg/opj_malloc.h
branches/soc-2008-nicholasbishop/extern/libredcode/debayer.c
branches/soc-2008-nicholasbishop/extern/make/msvc_7_0/extern.sln
branches/soc-2008-nicholasbishop/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2008-nicholasbishop/projectfiles_vc7/blender/blender.vcproj
branches/soc-2008-nicholasbishop/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
branches/soc-2008-nicholasbishop/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
branches/soc-2008-nicholasbishop/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj
branches/soc-2008-nicholasbishop/projectfiles_vc7/gameengine/converter/KX_converter.vcproj
branches/soc-2008-nicholasbishop/projectfiles_vc7/gameengine/gameplayer/common/GP_common.vcproj
branches/soc-2008-nicholasbishop/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
branches/soc-2008-nicholasbishop/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
branches/soc-2008-nicholasbishop/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj
branches/soc-2008-nicholasbishop/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
branches/soc-2008-nicholasbishop/release/datafiles/blenderbuttons
branches/soc-2008-nicholasbishop/release/scripts/ms3d_import.py
branches/soc-2008-nicholasbishop/release/scripts/vrml97_export.py
branches/soc-2008-nicholasbishop/source/Makefile
branches/soc-2008-nicholasbishop/source/blender/blenkernel/BKE_action.h
branches/soc-2008-nicholasbishop/source/blender/blenkernel/BKE_key.h
branches/soc-2008-nicholasbishop/source/blender/blenkernel/BKE_object.h
branches/soc-2008-nicholasbishop/source/blender/blenkernel/BKE_scene.h
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/action.c
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/armature.c
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/key.c
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/library.c
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/modifier.c
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/object.c
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/sca.c
branches/soc-2008-nicholasbishop/source/blender/blenlib/BLI_arithb.h
branches/soc-2008-nicholasbishop/source/blender/blenlib/intern/arithb.c
branches/soc-2008-nicholasbishop/source/blender/blenlib/intern/bpath.c
branches/soc-2008-nicholasbishop/source/blender/blenlib/intern/util.c
branches/soc-2008-nicholasbishop/source/blender/blenloader/intern/readfile.c
branches/soc-2008-nicholasbishop/source/blender/blenloader/intern/writefile.c
branches/soc-2008-nicholasbishop/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2008-nicholasbishop/source/blender/imbuf/intern/anim.c
branches/soc-2008-nicholasbishop/source/blender/imbuf/intern/cineon/dpxlib.c
branches/soc-2008-nicholasbishop/source/blender/include/BDR_editcurve.h
branches/soc-2008-nicholasbishop/source/blender/include/BIF_butspace.h
branches/soc-2008-nicholasbishop/source/blender/include/BIF_interface.h
branches/soc-2008-nicholasbishop/source/blender/include/BIF_oops.h
branches/soc-2008-nicholasbishop/source/blender/include/BIF_resources.h
branches/soc-2008-nicholasbishop/source/blender/include/BSE_view.h
branches/soc-2008-nicholasbishop/source/blender/include/butspace.h
branches/soc-2008-nicholasbishop/source/blender/include/transform.h
branches/soc-2008-nicholasbishop/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2008-nicholasbishop/source/blender/makesdna/DNA_controller_types.h
branches/soc-2008-nicholasbishop/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2008-nicholasbishop/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2008-nicholasbishop/source/blender/makesdna/DNA_object_types.h
branches/soc-2008-nicholasbishop/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-nicholasbishop/source/blender/makesdna/DNA_sensor_types.h
branches/soc-2008-nicholasbishop/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-nicholasbishop/source/blender/nodes/intern/CMP_nodes/CMP_math.c
branches/soc-2008-nicholasbishop/source/blender/nodes/intern/SHD_nodes/SHD_math.c
branches/soc-2008-nicholasbishop/source/blender/python/BPY_interface.c
branches/soc-2008-nicholasbishop/source/blender/python/api2_2x/Blender.c
branches/soc-2008-nicholasbishop/source/blender/python/api2_2x/Mathutils.c
branches/soc-2008-nicholasbishop/source/blender/python/api2_2x/Object.c
branches/soc-2008-nicholasbishop/source/blender/python/api2_2x/Particle.c
branches/soc-2008-nicholasbishop/source/blender/render/intern/source/convertblender.c
branches/soc-2008-nicholasbishop/source/blender/render/intern/source/shadbuf.c
branches/soc-2008-nicholasbishop/source/blender/src/CMakeLists.txt
branches/soc-2008-nicholasbishop/source/blender/src/Makefile
branches/soc-2008-nicholasbishop/source/blender/src/SConscript
branches/soc-2008-nicholasbishop/source/blender/src/blenderbuttons.c
branches/soc-2008-nicholasbishop/source/blender/src/buttons_editing.c
branches/soc-2008-nicholasbishop/source/blender/src/buttons_logic.c
branches/soc-2008-nicholasbishop/source/blender/src/buttons_object.c
branches/soc-2008-nicholasbishop/source/blender/src/buttons_scene.c
branches/soc-2008-nicholasbishop/source/blender/src/drawaction.c
branches/soc-2008-nicholasbishop/source/blender/src/drawipo.c
branches/soc-2008-nicholasbishop/source/blender/src/drawmesh.c
branches/soc-2008-nicholasbishop/source/blender/src/drawnode.c
branches/soc-2008-nicholasbishop/source/blender/src/drawoops.c
branches/soc-2008-nicholasbishop/source/blender/src/drawview.c
branches/soc-2008-nicholasbishop/source/blender/src/editcurve.c
branches/soc-2008-nicholasbishop/source/blender/src/editmesh_lib.c
branches/soc-2008-nicholasbishop/source/blender/src/editnode.c
branches/soc-2008-nicholasbishop/source/blender/src/editobject.c
branches/soc-2008-nicholasbishop/source/blender/src/editparticle.c
branches/soc-2008-nicholasbishop/source/blender/src/editseq.c
branches/soc-2008-nicholasbishop/source/blender/src/header_oops.c
branches/soc-2008-nicholasbishop/source/blender/src/header_view3d.c
branches/soc-2008-nicholasbishop/source/blender/src/interface.c
branches/soc-2008-nicholasbishop/source/blender/src/oops.c
branches/soc-2008-nicholasbishop/source/blender/src/sequence.c
branches/soc-2008-nicholasbishop/source/blender/src/space.c
branches/soc-2008-nicholasbishop/source/blender/src/transform.c
branches/soc-2008-nicholasbishop/source/blender/src/transform_constraints.c
branches/soc-2008-nicholasbishop/source/blender/src/transform_generics.c
branches/soc-2008-nicholasbishop/source/blender/src/transform_snap.c
branches/soc-2008-nicholasbishop/source/blender/src/usiblender.c
branches/soc-2008-nicholasbishop/source/blender/src/view.c
branches/soc-2008-nicholasbishop/source/creator/CMakeLists.txt
branches/soc-2008-nicholasbishop/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2008-nicholasbishop/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/soc-2008-nicholasbishop/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
branches/soc-2008-nicholasbishop/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/soc-2008-nicholasbishop/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2008-nicholasbishop/source/gameengine/BlenderRoutines/Makefile
branches/soc-2008-nicholasbishop/source/gameengine/BlenderRoutines/SConscript
branches/soc-2008-nicholasbishop/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Converter/BL_DeformableGameObject.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Converter/BL_DeformableGameObject.h
branches/soc-2008-nicholasbishop/source/gameengine/Converter/BL_MeshDeformer.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Converter/BL_MeshDeformer.h
branches/soc-2008-nicholasbishop/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Converter/BL_SkinDeformer.h
branches/soc-2008-nicholasbishop/source/gameengine/Converter/BL_SkinMeshObject.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Converter/BL_SkinMeshObject.h
branches/soc-2008-nicholasbishop/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/soc-2008-nicholasbishop/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Converter/KX_ConvertControllers.cpp
branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_AlwaysSensor.h
branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_IActuator.cpp
branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_IActuator.h
branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_IController.cpp
branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_IController.h
branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_IObject.cpp
branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_IObject.h
branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_ISensor.h
branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_JoystickSensor.h
branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_KeyboardSensor.h
branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_LogicManager.cpp
branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_MouseSensor.cpp
branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_MouseSensor.h
branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_PropertySensor.h
branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_RandomSensor.cpp
branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_RandomSensor.h
branches/soc-2008-nicholasbishop/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/soc-2008-nicholasbishop/source/gameengine/GamePlayer/common/GPC_Canvas.h
branches/soc-2008-nicholasbishop/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
branches/soc-2008-nicholasbishop/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2008-nicholasbishop/source/gameengine/GamePlayer/common/GPC_RenderTools.h
branches/soc-2008-nicholasbishop/source/gameengine/GamePlayer/common/Makefile
branches/soc-2008-nicholasbishop/source/gameengine/GamePlayer/common/SConscript
branches/soc-2008-nicholasbishop/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/soc-2008-nicholasbishop/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2008-nicholasbishop/source/gameengine/GamePlayer/ghost/GPG_Application.h
branches/soc-2008-nicholasbishop/source/gameengine/GamePlayer/ghost/Makefile
branches/soc-2008-nicholasbishop/source/gameengine/GamePlayer/ghost/SConscript
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/BL_Material.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/BL_Material.h
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_ISceneConverter.h
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_RayCast.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_RaySensor.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_RaySensor.h
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_TouchSensor.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_TouchSensor.h
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/Makefile
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/SConscript
branches/soc-2008-nicholasbishop/source/gameengine/PyDoc/KX_GameObject.py
branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/CMakeLists.txt
branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/Makefile
branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_CameraData.h
branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_Deformer.h
branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/SConscript
branches/soc-2008-nicholasbishop/source/gameengine/SceneGraph/SG_Node.cpp
branches/soc-2008-nicholasbishop/source/gameengine/SceneGraph/SG_Node.h
branches/soc-2008-nicholasbishop/source/gameengine/SceneGraph/SG_ParentRelation.h
branches/soc-2008-nicholasbishop/source/gameengine/SceneGraph/SG_Spatial.cpp
branches/soc-2008-nicholasbishop/source/gameengine/SceneGraph/SG_Spatial.h
branches/soc-2008-nicholasbishop/source/nan_definitions.mk
Added Paths:
-----------
branches/soc-2008-nicholasbishop/extern/glew/
branches/soc-2008-nicholasbishop/extern/glew/CMakeLists.txt
branches/soc-2008-nicholasbishop/extern/glew/ChangeLog
branches/soc-2008-nicholasbishop/extern/glew/README.txt
branches/soc-2008-nicholasbishop/extern/glew/SConscript
branches/soc-2008-nicholasbishop/extern/glew/doc/
branches/soc-2008-nicholasbishop/extern/glew/doc/advanced.html
branches/soc-2008-nicholasbishop/extern/glew/doc/basic.html
branches/soc-2008-nicholasbishop/extern/glew/doc/credits.html
branches/soc-2008-nicholasbishop/extern/glew/doc/glew.css
branches/soc-2008-nicholasbishop/extern/glew/doc/glew.html
branches/soc-2008-nicholasbishop/extern/glew/doc/glx.txt
branches/soc-2008-nicholasbishop/extern/glew/doc/glxew.html
branches/soc-2008-nicholasbishop/extern/glew/doc/gpl.txt
branches/soc-2008-nicholasbishop/extern/glew/doc/index.html
branches/soc-2008-nicholasbishop/extern/glew/doc/install.html
branches/soc-2008-nicholasbishop/extern/glew/doc/log.html
branches/soc-2008-nicholasbishop/extern/glew/doc/sgi.txt
branches/soc-2008-nicholasbishop/extern/glew/doc/wglew.html
branches/soc-2008-nicholasbishop/extern/glew/include/
branches/soc-2008-nicholasbishop/extern/glew/include/GL/
branches/soc-2008-nicholasbishop/extern/glew/include/GL/glew.h
branches/soc-2008-nicholasbishop/extern/glew/include/GL/glxew.h
branches/soc-2008-nicholasbishop/extern/glew/include/GL/wglew.h
branches/soc-2008-nicholasbishop/extern/glew/make/
branches/soc-2008-nicholasbishop/extern/glew/make/msvc_7_0/
branches/soc-2008-nicholasbishop/extern/glew/make/msvc_7_0/glew_vc7.vcproj
branches/soc-2008-nicholasbishop/extern/glew/src/
branches/soc-2008-nicholasbishop/extern/glew/src/Makefile
branches/soc-2008-nicholasbishop/extern/glew/src/glew.c
branches/soc-2008-nicholasbishop/extern/libopenjpeg/patches/
branches/soc-2008-nicholasbishop/extern/libopenjpeg/patches/osx.patch
branches/soc-2008-nicholasbishop/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/soc-2008-nicholasbishop/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Converter/BL_ShapeDeformer.h
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/BL_BlenderShader.h
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_StateActuator.cpp
branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_StateActuator.h
Removed Paths:
-------------
branches/soc-2008-nicholasbishop/extern/glew/CMakeLists.txt
branches/soc-2008-nicholasbishop/extern/glew/ChangeLog
branches/soc-2008-nicholasbishop/extern/glew/README.txt
branches/soc-2008-nicholasbishop/extern/glew/SConscript
branches/soc-2008-nicholasbishop/extern/glew/doc/
branches/soc-2008-nicholasbishop/extern/glew/doc/advanced.html
branches/soc-2008-nicholasbishop/extern/glew/doc/basic.html
branches/soc-2008-nicholasbishop/extern/glew/doc/credits.html
branches/soc-2008-nicholasbishop/extern/glew/doc/glew.css
branches/soc-2008-nicholasbishop/extern/glew/doc/glew.html
branches/soc-2008-nicholasbishop/extern/glew/doc/glx.txt
branches/soc-2008-nicholasbishop/extern/glew/doc/glxew.html
branches/soc-2008-nicholasbishop/extern/glew/doc/gpl.txt
branches/soc-2008-nicholasbishop/extern/glew/doc/index.html
branches/soc-2008-nicholasbishop/extern/glew/doc/install.html
branches/soc-2008-nicholasbishop/extern/glew/doc/log.html
branches/soc-2008-nicholasbishop/extern/glew/doc/sgi.txt
branches/soc-2008-nicholasbishop/extern/glew/doc/wglew.html
branches/soc-2008-nicholasbishop/extern/glew/include/
branches/soc-2008-nicholasbishop/extern/glew/include/GL/
branches/soc-2008-nicholasbishop/extern/glew/include/GL/glew.h
branches/soc-2008-nicholasbishop/extern/glew/include/GL/glxew.h
branches/soc-2008-nicholasbishop/extern/glew/include/GL/wglew.h
branches/soc-2008-nicholasbishop/extern/glew/make/
branches/soc-2008-nicholasbishop/extern/glew/make/msvc_7_0/
branches/soc-2008-nicholasbishop/extern/glew/make/msvc_7_0/glew_vc7.vcproj
branches/soc-2008-nicholasbishop/extern/glew/src/
branches/soc-2008-nicholasbishop/extern/glew/src/Makefile
branches/soc-2008-nicholasbishop/extern/glew/src/glew.c
branches/soc-2008-nicholasbishop/extern/libopenjpeg/patches/osx.patch
branches/soc-2008-nicholasbishop/source/gameengine/BlenderRoutines/mac_compat_glext.h
branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ARB_multitexture.h
branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/EXT_separate_specular_color.h
branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/mkglext.py
Modified: branches/soc-2008-nicholasbishop/blenderplayer/CMakeLists.txt
===================================================================
--- branches/soc-2008-nicholasbishop/blenderplayer/CMakeLists.txt 2008-06-22 21:48:02 UTC (rev 15319)
+++ branches/soc-2008-nicholasbishop/blenderplayer/CMakeLists.txt 2008-06-22 21:56:52 UTC (rev 15320)
@@ -108,6 +108,7 @@
blenkernel_blc
bf_quicktime
extern_binreloc
+ extern_glew
)
FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
Modified: branches/soc-2008-nicholasbishop/extern/CMakeLists.txt
===================================================================
--- branches/soc-2008-nicholasbishop/extern/CMakeLists.txt 2008-06-22 21:48:02 UTC (rev 15319)
+++ branches/soc-2008-nicholasbishop/extern/CMakeLists.txt 2008-06-22 21:56:52 UTC (rev 15320)
@@ -43,3 +43,6 @@
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
SUBDIRS(binreloc)
ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+
+SUBDIRS(glew)
+
Modified: branches/soc-2008-nicholasbishop/extern/Makefile
===================================================================
--- branches/soc-2008-nicholasbishop/extern/Makefile 2008-06-22 21:48:02 UTC (rev 15319)
+++ branches/soc-2008-nicholasbishop/extern/Makefile 2008-06-22 21:56:52 UTC (rev 15320)
@@ -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/soc-2008-nicholasbishop/extern/SConscript
===================================================================
--- branches/soc-2008-nicholasbishop/extern/SConscript 2008-06-22 21:48:02 UTC (rev 15319)
+++ branches/soc-2008-nicholasbishop/extern/SConscript 2008-06-22 21:56:52 UTC (rev 15320)
@@ -2,6 +2,8 @@
Import('env')
+SConscript(['glew/SConscript'])
+
if env['WITH_BF_GAMEENGINE']:
SConscript(['qhull/SConscript',
'solid/SConscript'])
Modified: branches/soc-2008-nicholasbishop/extern/bFTGL/SConscript
===================================================================
--- branches/soc-2008-nicholasbishop/extern/bFTGL/SConscript 2008-06-22 21:48:02 UTC (rev 15319)
+++ branches/soc-2008-nicholasbishop/extern/bFTGL/SConscript 2008-06-22 21:56:52 UTC (rev 15320)
@@ -22,7 +22,7 @@
#ftgl_env.Append (CPPDEFINES = defines)
-incs = 'include src ' + env['BF_FREETYPE_INC']
+incs = 'include src ' + env['BF_FREETYPE_INC'] + ' ' + env['BF_OPENGL_INC']
defs = ''
sources = env.Glob('src/*.cpp')
Copied: branches/soc-2008-nicholasbishop/extern/glew (from rev 15318, trunk/blender/extern/glew)
Deleted: branches/soc-2008-nicholasbishop/extern/glew/CMakeLists.txt
===================================================================
--- trunk/blender/extern/glew/CMakeLists.txt 2008-06-22 21:33:58 UTC (rev 15318)
+++ branches/soc-2008-nicholasbishop/extern/glew/CMakeLists.txt 2008-06-22 21:56:52 UTC (rev 15320)
@@ -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/soc-2008-nicholasbishop/extern/glew/CMakeLists.txt (from rev 15318, trunk/blender/extern/glew/CMakeLists.txt)
===================================================================
--- branches/soc-2008-nicholasbishop/extern/glew/CMakeLists.txt (rev 0)
+++ branches/soc-2008-nicholasbishop/extern/glew/CMakeLists.txt 2008-06-22 21:56:52 UTC (rev 15320)
@@ -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/soc-2008-nicholasbishop/extern/glew/ChangeLog
===================================================================
--- trunk/blender/extern/glew/ChangeLog 2008-06-22 21:33:58 UTC (rev 15318)
+++ branches/soc-2008-nicholasbishop/extern/glew/ChangeLog 2008-06-22 21:56:52 UTC (rev 15320)
@@ -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
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list