svn merge -r 15202:15292 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Fri, 20 Jun 2008 21:36:15 +0000 (21:36 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Fri, 20 Jun 2008 21:36:15 +0000 (21:36 +0000)
commitffbe42129e0d043214daf9b07125d9d8140d1c74
tree6c99776cfcfadd32347eacb287c69deaa1b35651
parent824eac5095924ffdc1fea213a925054c88bf05d7
svn merge -r 15202:15292 https://svn.blender.org/svnroot/bf-blender/trunk/blender
160 files changed:
blenderplayer/CMakeLists.txt
extern/CMakeLists.txt
extern/Makefile
extern/SConscript
extern/glew/CMakeLists.txt [new file with mode: 0644]
extern/glew/README.txt [new file with mode: 0644]
extern/glew/SConscript [new file with mode: 0644]
extern/glew/include/GL/glew.h [new file with mode: 0644]
extern/glew/include/GL/glxew.h [new file with mode: 0644]
extern/glew/include/GL/wglew.h [new file with mode: 0644]
extern/glew/make/msvc_7_0/glew_vc7.vcproj [new file with mode: 0644]
extern/glew/src/Makefile [new file with mode: 0644]
extern/glew/src/glew.c [new file with mode: 0644]
extern/make/msvc_7_0/extern.sln
intern/ghost/intern/GHOST_SystemX11.cpp
projectfiles_vc7/blender/blender.vcproj
projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj
projectfiles_vc7/gameengine/converter/KX_converter.vcproj
projectfiles_vc7/gameengine/gameplayer/common/GP_common.vcproj
projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj
projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
release/scripts/ms3d_import.py
release/scripts/vrml97_export.py
source/Makefile
source/blender/blenkernel/BKE_action.h
source/blender/blenkernel/BKE_key.h
source/blender/blenkernel/BKE_scene.h
source/blender/blenkernel/intern/action.c
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/key.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/sca.c
source/blender/blenlib/intern/util.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/imbuf/intern/cineon/dpxlib.c
source/blender/include/BDR_editcurve.h
source/blender/include/BIF_oops.h
source/blender/makesdna/DNA_actuator_types.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/nodes/intern/CMP_nodes/CMP_math.c
source/blender/nodes/intern/SHD_nodes/SHD_math.c
source/blender/python/api2_2x/Mathutils.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/shadbuf.c
source/blender/src/CMakeLists.txt
source/blender/src/Makefile
source/blender/src/SConscript
source/blender/src/buttons_editing.c
source/blender/src/buttons_logic.c
source/blender/src/drawaction.c
source/blender/src/drawnode.c
source/blender/src/drawoops.c
source/blender/src/editcurve.c
source/blender/src/editobject.c
source/blender/src/header_oops.c
source/blender/src/oops.c
source/blender/src/transform_constraints.c
source/blender/src/transform_snap.c
source/blender/src/usiblender.c
source/blender/src/view.c
source/creator/CMakeLists.txt
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
source/gameengine/BlenderRoutines/CMakeLists.txt
source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
source/gameengine/BlenderRoutines/Makefile
source/gameengine/BlenderRoutines/SConscript
source/gameengine/BlenderRoutines/mac_compat_glext.h [deleted file]
source/gameengine/Converter/BL_ActionActuator.cpp
source/gameengine/Converter/BL_ArmatureObject.cpp
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Converter/BL_DeformableGameObject.cpp
source/gameengine/Converter/BL_DeformableGameObject.h
source/gameengine/Converter/BL_MeshDeformer.cpp
source/gameengine/Converter/BL_MeshDeformer.h
source/gameengine/Converter/BL_ShapeActionActuator.cpp [new file with mode: 0644]
source/gameengine/Converter/BL_ShapeActionActuator.h [new file with mode: 0644]
source/gameengine/Converter/BL_ShapeDeformer.cpp [new file with mode: 0644]
source/gameengine/Converter/BL_ShapeDeformer.h [new file with mode: 0644]
source/gameengine/Converter/BL_SkinDeformer.cpp
source/gameengine/Converter/BL_SkinDeformer.h
source/gameengine/Converter/BL_SkinMeshObject.cpp
source/gameengine/Converter/BL_SkinMeshObject.h
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
source/gameengine/Converter/KX_BlenderSceneConverter.h
source/gameengine/Converter/KX_ConvertActuators.cpp
source/gameengine/GameLogic/SCA_IObject.h
source/gameengine/GamePlayer/common/CMakeLists.txt
source/gameengine/GamePlayer/common/GPC_Canvas.h
source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
source/gameengine/GamePlayer/common/GPC_RenderTools.h
source/gameengine/GamePlayer/common/Makefile
source/gameengine/GamePlayer/common/SConscript
source/gameengine/GamePlayer/ghost/CMakeLists.txt
source/gameengine/GamePlayer/ghost/GPG_Application.cpp
source/gameengine/GamePlayer/ghost/GPG_Application.h
source/gameengine/GamePlayer/ghost/Makefile
source/gameengine/GamePlayer/ghost/SConscript
source/gameengine/Ketsji/BL_BlenderShader.cpp [new file with mode: 0644]
source/gameengine/Ketsji/BL_BlenderShader.h [new file with mode: 0644]
source/gameengine/Ketsji/BL_Material.cpp
source/gameengine/Ketsji/BL_Material.h
source/gameengine/Ketsji/BL_Shader.cpp
source/gameengine/Ketsji/BL_Texture.cpp
source/gameengine/Ketsji/CMakeLists.txt
source/gameengine/Ketsji/KX_BlenderMaterial.cpp
source/gameengine/Ketsji/KX_BlenderMaterial.h
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_GameObject.h
source/gameengine/Ketsji/KX_ISceneConverter.h
source/gameengine/Ketsji/KX_IpoActuator.cpp
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
source/gameengine/Ketsji/KX_KetsjiEngine.h
source/gameengine/Ketsji/KX_PythonInit.cpp
source/gameengine/Ketsji/KX_RayCast.cpp
source/gameengine/Ketsji/KX_SG_NodeRelationships.h
source/gameengine/Ketsji/KX_Scene.cpp
source/gameengine/Ketsji/Makefile
source/gameengine/Ketsji/SConscript
source/gameengine/PyDoc/KX_GameObject.py
source/gameengine/Rasterizer/CMakeLists.txt
source/gameengine/Rasterizer/Makefile
source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
source/gameengine/Rasterizer/RAS_CameraData.h
source/gameengine/Rasterizer/RAS_Deformer.h
source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
source/gameengine/Rasterizer/RAS_IRasterizer.h
source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
source/gameengine/Rasterizer/RAS_MeshObject.cpp
source/gameengine/Rasterizer/RAS_MeshObject.h
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ARB_multitexture.h [deleted file]
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/EXT_separate_specular_color.h [deleted file]
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/mkglext.py [deleted file]
source/gameengine/Rasterizer/SConscript
source/gameengine/SceneGraph/SG_Node.cpp
source/gameengine/SceneGraph/SG_Node.h
source/gameengine/SceneGraph/SG_ParentRelation.h
source/gameengine/SceneGraph/SG_Spatial.cpp
source/gameengine/SceneGraph/SG_Spatial.h
source/nan_definitions.mk