[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16402] branches/soc-2008-unclezeiv: svn merge -r 16291:16399 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Davide Vercelli davide.vercelli at gmail.com
Sun Sep 7 09:59:07 CEST 2008


Revision: 16402
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16402
Author:   unclezeiv
Date:     2008-09-07 09:59:06 +0200 (Sun, 07 Sep 2008)

Log Message:
-----------
svn merge -r 16291:16399 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Modified Paths:
--------------
    branches/soc-2008-unclezeiv/CMake/macros.cmake
    branches/soc-2008-unclezeiv/CMakeLists.txt
    branches/soc-2008-unclezeiv/blenderplayer/CMakeLists.txt
    branches/soc-2008-unclezeiv/config/darwin-config.py
    branches/soc-2008-unclezeiv/extern/glew/SConscript
    branches/soc-2008-unclezeiv/extern/glew/include/GL/glew.h
    branches/soc-2008-unclezeiv/extern/glew/src/glew.c
    branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2008-unclezeiv/intern/guardedalloc/MEM_guardedalloc.h
    branches/soc-2008-unclezeiv/intern/guardedalloc/intern/mallocn.c
    branches/soc-2008-unclezeiv/intern/memutil/MEM_Allocator.h
    branches/soc-2008-unclezeiv/intern/memutil/MEM_CacheLimiter.h
    branches/soc-2008-unclezeiv/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
    branches/soc-2008-unclezeiv/intern/moto/include/GEN_Map.h
    branches/soc-2008-unclezeiv/intern/moto/include/MT_Matrix4x4.h
    branches/soc-2008-unclezeiv/intern/moto/include/MT_Matrix4x4.inl
    branches/soc-2008-unclezeiv/intern/opennl/superlu/BLO_sys_types.h
    branches/soc-2008-unclezeiv/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
    branches/soc-2008-unclezeiv/projectfiles_vc7/blender/blender.sln
    branches/soc-2008-unclezeiv/projectfiles_vc7/blender/blender.vcproj
    branches/soc-2008-unclezeiv/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
    branches/soc-2008-unclezeiv/projectfiles_vc7/blender/nodes/nodes.vcproj
    branches/soc-2008-unclezeiv/projectfiles_vc7/blender/radiosity/BRA_radiosity.vcproj
    branches/soc-2008-unclezeiv/projectfiles_vc7/blender/src/BL_src.vcproj
    branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj
    branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/converter/KX_converter.vcproj
    branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/expression/EXP_expressions.vcproj
    branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
    branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
    branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
    branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
    branches/soc-2008-unclezeiv/release/datafiles/blenderbuttons
    branches/soc-2008-unclezeiv/release/scripts/bpymodules/colladaImEx/collada.py
    branches/soc-2008-unclezeiv/release/scripts/bpymodules/colladaImEx/cstartup.py
    branches/soc-2008-unclezeiv/release/scripts/bpymodules/colladaImEx/helperObjects.py
    branches/soc-2008-unclezeiv/release/scripts/bpymodules/colladaImEx/translator.py
    branches/soc-2008-unclezeiv/release/scripts/mesh_cleanup.py
    branches/soc-2008-unclezeiv/release/scripts/object_find.py
    branches/soc-2008-unclezeiv/release/scripts/sysinfo.py
    branches/soc-2008-unclezeiv/source/Makefile
    branches/soc-2008-unclezeiv/source/blender/CMakeLists.txt
    branches/soc-2008-unclezeiv/source/blender/Makefile
    branches/soc-2008-unclezeiv/source/blender/SConscript
    branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_action.h
    branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_bad_level_calls.h
    branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_colortools.h
    branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_global.h
    branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_node.h
    branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_text.h
    branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_texture.h
    branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_utildefines.h
    branches/soc-2008-unclezeiv/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2008-unclezeiv/source/blender/blenkernel/SConscript
    branches/soc-2008-unclezeiv/source/blender/blenkernel/bad_level_call_stubs/stubs.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/Makefile
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/action.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/anim.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/blender.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/colortools.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/image.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/ipo.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/material.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/mesh.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/node.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/object.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/softbody.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/text.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/texture.c
    branches/soc-2008-unclezeiv/source/blender/blenlib/BLI_arithb.h
    branches/soc-2008-unclezeiv/source/blender/blenlib/BLI_blenlib.h
    branches/soc-2008-unclezeiv/source/blender/blenlib/SConscript
    branches/soc-2008-unclezeiv/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/soc-2008-unclezeiv/source/blender/blenlib/intern/arithb.c
    branches/soc-2008-unclezeiv/source/blender/blenloader/BLO_sys_types.h
    branches/soc-2008-unclezeiv/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-unclezeiv/source/blender/blenloader/intern/writefile.c
    branches/soc-2008-unclezeiv/source/blender/include/BDR_drawmesh.h
    branches/soc-2008-unclezeiv/source/blender/include/BDR_drawobject.h
    branches/soc-2008-unclezeiv/source/blender/include/BDR_imagepaint.h
    branches/soc-2008-unclezeiv/source/blender/include/BIF_drawtext.h
    branches/soc-2008-unclezeiv/source/blender/include/BIF_editarmature.h
    branches/soc-2008-unclezeiv/source/blender/include/BIF_gl.h
    branches/soc-2008-unclezeiv/source/blender/include/BIF_keyval.h
    branches/soc-2008-unclezeiv/source/blender/include/BIF_meshtools.h
    branches/soc-2008-unclezeiv/source/blender/include/BIF_resources.h
    branches/soc-2008-unclezeiv/source/blender/include/BIF_space.h
    branches/soc-2008-unclezeiv/source/blender/include/BSE_drawview.h
    branches/soc-2008-unclezeiv/source/blender/include/blendef.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_actuator_types.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_brush_types.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_group_types.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_image_types.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_ipo_types.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_lamp_types.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_material_types.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_meshdata_types.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_object_types.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_sensor_types.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_space_types.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_text_types.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_texture_types.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_world_types.h
    branches/soc-2008-unclezeiv/source/blender/nodes/CMakeLists.txt
    branches/soc-2008-unclezeiv/source/blender/nodes/SConscript
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/CMP_nodes/Makefile
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/Makefile
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/SHD_nodes/Makefile
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/SHD_nodes/SHD_camera.c
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/SHD_nodes/SHD_curves.c
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/SHD_nodes/SHD_invert.c
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/SHD_nodes/SHD_material.c
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/SHD_nodes/SHD_math.c
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/SHD_nodes/SHD_normal.c
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/SHD_nodes/SHD_output.c
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/SHD_nodes/SHD_rgb.c
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/SHD_nodes/SHD_sepcombRGB.c
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/SHD_nodes/SHD_squeeze.c
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/SHD_nodes/SHD_texture.c
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/SHD_nodes/SHD_value.c
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/SHD_util.h
    branches/soc-2008-unclezeiv/source/blender/python/BPY_extern.h
    branches/soc-2008-unclezeiv/source/blender/python/BPY_interface.c
    branches/soc-2008-unclezeiv/source/blender/python/BPY_menus.c
    branches/soc-2008-unclezeiv/source/blender/python/BPY_menus.h
    branches/soc-2008-unclezeiv/source/blender/python/CMakeLists.txt
    branches/soc-2008-unclezeiv/source/blender/python/SConscript
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Blender.c
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Group.c
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Image.c
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Lamp.c
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/MTex.c
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Makefile
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Material.c
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Mathutils.c
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Mathutils.h
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Mesh.c
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Text.c
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Text.h
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Texture.c
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Draw.py
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Group.py
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Mesh.py
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Text.py
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/gen_utils.h
    branches/soc-2008-unclezeiv/source/blender/radiosity/CMakeLists.txt
    branches/soc-2008-unclezeiv/source/blender/radiosity/SConscript
    branches/soc-2008-unclezeiv/source/blender/radiosity/intern/source/Makefile
    branches/soc-2008-unclezeiv/source/blender/render/intern/include/render_types.h
    branches/soc-2008-unclezeiv/source/blender/render/intern/source/pipeline.c
    branches/soc-2008-unclezeiv/source/blender/render/intern/source/rayshade.c
    branches/soc-2008-unclezeiv/source/blender/render/intern/source/shadbuf.c
    branches/soc-2008-unclezeiv/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2008-unclezeiv/source/blender/render/intern/source/zbuf.c
    branches/soc-2008-unclezeiv/source/blender/src/CMakeLists.txt
    branches/soc-2008-unclezeiv/source/blender/src/Makefile
    branches/soc-2008-unclezeiv/source/blender/src/SConscript
    branches/soc-2008-unclezeiv/source/blender/src/blenderbuttons.c
    branches/soc-2008-unclezeiv/source/blender/src/buttons_editing.c
    branches/soc-2008-unclezeiv/source/blender/src/buttons_logic.c
    branches/soc-2008-unclezeiv/source/blender/src/buttons_object.c
    branches/soc-2008-unclezeiv/source/blender/src/buttons_shading.c
    branches/soc-2008-unclezeiv/source/blender/src/drawarmature.c
    branches/soc-2008-unclezeiv/source/blender/src/drawgpencil.c
    branches/soc-2008-unclezeiv/source/blender/src/drawimage.c
    branches/soc-2008-unclezeiv/source/blender/src/drawmesh.c
    branches/soc-2008-unclezeiv/source/blender/src/drawobject.c
    branches/soc-2008-unclezeiv/source/blender/src/drawtext.c
    branches/soc-2008-unclezeiv/source/blender/src/drawview.c
    branches/soc-2008-unclezeiv/source/blender/src/editarmature.c
    branches/soc-2008-unclezeiv/source/blender/src/editdeform.c
    branches/soc-2008-unclezeiv/source/blender/src/editface.c
    branches/soc-2008-unclezeiv/source/blender/src/editipo_lib.c
    branches/soc-2008-unclezeiv/source/blender/src/editlattice.c
    branches/soc-2008-unclezeiv/source/blender/src/editmesh.c
    branches/soc-2008-unclezeiv/source/blender/src/editmesh_mods.c
    branches/soc-2008-unclezeiv/source/blender/src/editmesh_tools.c
    branches/soc-2008-unclezeiv/source/blender/src/editmode_undo.c
    branches/soc-2008-unclezeiv/source/blender/src/editnode.c
    branches/soc-2008-unclezeiv/source/blender/src/editobject.c
    branches/soc-2008-unclezeiv/source/blender/src/editsound.c
    branches/soc-2008-unclezeiv/source/blender/src/editview.c
    branches/soc-2008-unclezeiv/source/blender/src/gpencil.c
    branches/soc-2008-unclezeiv/source/blender/src/header_image.c
    branches/soc-2008-unclezeiv/source/blender/src/header_info.c
    branches/soc-2008-unclezeiv/source/blender/src/header_node.c
    branches/soc-2008-unclezeiv/source/blender/src/header_text.c
    branches/soc-2008-unclezeiv/source/blender/src/header_view3d.c
    branches/soc-2008-unclezeiv/source/blender/src/headerbuttons.c
    branches/soc-2008-unclezeiv/source/blender/src/imagepaint.c
    branches/soc-2008-unclezeiv/source/blender/src/keyval.c
    branches/soc-2008-unclezeiv/source/blender/src/meshtools.c
    branches/soc-2008-unclezeiv/source/blender/src/playanim.c
    branches/soc-2008-unclezeiv/source/blender/src/previewrender.c
    branches/soc-2008-unclezeiv/source/blender/src/renderwin.c
    branches/soc-2008-unclezeiv/source/blender/src/sculptmode.c
    branches/soc-2008-unclezeiv/source/blender/src/sequence.c
    branches/soc-2008-unclezeiv/source/blender/src/space.c
    branches/soc-2008-unclezeiv/source/blender/src/toets.c
    branches/soc-2008-unclezeiv/source/blender/src/toolbox.c
    branches/soc-2008-unclezeiv/source/blender/src/transform_conversions.c
    branches/soc-2008-unclezeiv/source/blender/src/usiblender.c
    branches/soc-2008-unclezeiv/source/blender/src/verse_image.c
    branches/soc-2008-unclezeiv/source/blender/src/view.c
    branches/soc-2008-unclezeiv/source/blender/yafray/intern/export_File.cpp
    branches/soc-2008-unclezeiv/source/blender/yafray/intern/export_Plugin.cpp
    branches/soc-2008-unclezeiv/source/creator/CMakeLists.txt
    branches/soc-2008-unclezeiv/source/creator/Makefile
    branches/soc-2008-unclezeiv/source/creator/SConscript
    branches/soc-2008-unclezeiv/source/creator/creator.c
    branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/KX_BlenderGL.h
    branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
    branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/Makefile
    branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/SConscript
    branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_ArmatureObject.h
    branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_DeformableGameObject.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_MeshDeformer.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_MeshDeformer.h
    branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_ShapeDeformer.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_ShapeDeformer.h
    branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_SkinDeformer.h
    branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_SkinMeshObject.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_SkinMeshObject.h
    branches/soc-2008-unclezeiv/source/gameengine/Converter/CMakeLists.txt
    branches/soc-2008-unclezeiv/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Converter/KX_BlenderSceneConverter.h
    branches/soc-2008-unclezeiv/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Converter/Makefile
    branches/soc-2008-unclezeiv/source/gameengine/Converter/SConscript
    branches/soc-2008-unclezeiv/source/gameengine/Expressions/Makefile
    branches/soc-2008-unclezeiv/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Expressions/PyObjectPlus.h
    branches/soc-2008-unclezeiv/source/gameengine/Expressions/Value.cpp
    branches/soc-2008-unclezeiv/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
    branches/soc-2008-unclezeiv/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
    branches/soc-2008-unclezeiv/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h
    branches/soc-2008-unclezeiv/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
    branches/soc-2008-unclezeiv/source/gameengine/GameLogic/Joystick/SCA_JoystickPrivate.h
    branches/soc-2008-unclezeiv/source/gameengine/GameLogic/Makefile
    branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
    branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_JoystickManager.cpp
    branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_JoystickManager.h
    branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_JoystickSensor.h
    branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
    branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/common/CMakeLists.txt
    branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/common/GPC_RenderTools.h
    branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/common/Makefile
    branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/common/SConscript
    branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/common/unix/GPU_PolygonMaterial.h
    branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/ghost/GPG_Application.h
    branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/ghost/Makefile
    branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/ghost/SConscript
    branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/BL_BlenderShader.h
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/BL_Material.h
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/BL_Shader.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/BL_Shader.h
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/CMakeLists.txt
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_ISceneConverter.h
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_Light.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_Light.h
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_ParentActuator.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_PolyProxy.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_PolygonMaterial.h
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_PythonInit.h
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_Scene.h
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_VertexProxy.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_VisibilityActuator.h
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/Makefile
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/SConscript
    branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/soc-2008-unclezeiv/source/gameengine/PyDoc/GameKeys.py
    branches/soc-2008-unclezeiv/source/gameengine/PyDoc/GameLogic.py
    branches/soc-2008-unclezeiv/source/gameengine/PyDoc/KX_GameObject.py
    branches/soc-2008-unclezeiv/source/gameengine/PyDoc/KX_ObjectActuator.py
    branches/soc-2008-unclezeiv/source/gameengine/PyDoc/KX_PolyProxy.py
    branches/soc-2008-unclezeiv/source/gameengine/PyDoc/KX_SCA_ReplaceMeshActuator.py
    branches/soc-2008-unclezeiv/source/gameengine/PyDoc/KX_TrackToActuator.py
    branches/soc-2008-unclezeiv/source/gameengine/PyDoc/Rasterizer.py
    branches/soc-2008-unclezeiv/source/gameengine/PyDoc/SCA_DelaySensor.py
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/Makefile
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_BucketManager.h
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_IRenderTools.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_IRenderTools.h
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_MaterialBucket.h
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_MeshObject.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_MeshObject.h
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_Polygon.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_Polygon.h
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_TexVert.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_TexVert.h
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/SConscript
    branches/soc-2008-unclezeiv/source/kernel/gen_system/GEN_Map.h
    branches/soc-2008-unclezeiv/source/nan_definitions.mk
    branches/soc-2008-unclezeiv/tools/btools.py

Added Paths:
-----------
    branches/soc-2008-unclezeiv/projectfiles_vc7/blender/gpu/
    branches/soc-2008-unclezeiv/projectfiles_vc7/blender/gpu/BL_gpu.vcproj
    branches/soc-2008-unclezeiv/release/scripts/bpymodules/BPyTextPlugin.py
    branches/soc-2008-unclezeiv/release/scripts/scripttemplate_text_plugin.py
    branches/soc-2008-unclezeiv/release/scripts/textplugin_functiondocs.py
    branches/soc-2008-unclezeiv/release/scripts/textplugin_imports.py
    branches/soc-2008-unclezeiv/release/scripts/textplugin_membersuggest.py
    branches/soc-2008-unclezeiv/release/scripts/textplugin_outliner.py
    branches/soc-2008-unclezeiv/release/scripts/textplugin_suggest.py
    branches/soc-2008-unclezeiv/release/scripts/textplugin_templates.py
    branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_suggestions.h
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/suggestions.c
    branches/soc-2008-unclezeiv/source/blender/gpu/
    branches/soc-2008-unclezeiv/source/blender/gpu/CMakeLists.txt
    branches/soc-2008-unclezeiv/source/blender/gpu/GPU_draw.h
    branches/soc-2008-unclezeiv/source/blender/gpu/GPU_extensions.h
    branches/soc-2008-unclezeiv/source/blender/gpu/GPU_material.h
    branches/soc-2008-unclezeiv/source/blender/gpu/Makefile
    branches/soc-2008-unclezeiv/source/blender/gpu/SConscript
    branches/soc-2008-unclezeiv/source/blender/gpu/intern/
    branches/soc-2008-unclezeiv/source/blender/gpu/intern/Makefile
    branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_codegen.c
    branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_codegen.h
    branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_material.c
    branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_shader_vertex.glsl
    branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_shader_vertex.glsl.c

Removed Paths:
-------------
    branches/soc-2008-unclezeiv/projectfiles_vc7/blender/gpu/BL_gpu.vcproj
    branches/soc-2008-unclezeiv/source/blender/gpu/CMakeLists.txt
    branches/soc-2008-unclezeiv/source/blender/gpu/GPU_draw.h
    branches/soc-2008-unclezeiv/source/blender/gpu/GPU_extensions.h
    branches/soc-2008-unclezeiv/source/blender/gpu/GPU_material.h
    branches/soc-2008-unclezeiv/source/blender/gpu/Makefile
    branches/soc-2008-unclezeiv/source/blender/gpu/SConscript
    branches/soc-2008-unclezeiv/source/blender/gpu/intern/
    branches/soc-2008-unclezeiv/source/blender/gpu/intern/Makefile
    branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_codegen.c
    branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_codegen.h
    branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_material.c
    branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_shader_vertex.glsl
    branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_shader_vertex.glsl.c

Modified: branches/soc-2008-unclezeiv/CMake/macros.cmake
===================================================================
--- branches/soc-2008-unclezeiv/CMake/macros.cmake	2008-09-07 04:43:31 UTC (rev 16401)
+++ branches/soc-2008-unclezeiv/CMake/macros.cmake	2008-09-07 07:59:06 UTC (rev 16402)
@@ -39,7 +39,9 @@
 
 MACRO(SETUP_LIBDIRS)
   # see "cmake --help-policy CMP0003"
-  CMAKE_POLICY(SET CMP0003 NEW)
+  if(COMMAND cmake_policy)
+    CMAKE_POLICY(SET CMP0003 NEW)
+  endif(COMMAND cmake_policy)
   LINK_DIRECTORIES(${PYTHON_LIBPATH} ${SDL_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${ICONV_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH})
   IF(WITH_INTERNATIONAL)
     LINK_DIRECTORIES(${GETTEXT_LIBPATH})

Modified: branches/soc-2008-unclezeiv/CMakeLists.txt
===================================================================
--- branches/soc-2008-unclezeiv/CMakeLists.txt	2008-09-07 04:43:31 UTC (rev 16401)
+++ branches/soc-2008-unclezeiv/CMakeLists.txt	2008-09-07 07:59:06 UTC (rev 16402)
@@ -248,7 +248,11 @@
   
   SET(GETTEXT ${LIBDIR}/gettext)
   SET(GETTEXT_INC ${GETTEXT}/include)
-  SET(GETTEXT_LIB gnu_gettext)
+  IF(CMAKE_CL_64)
+  	SET(GETTEXT_LIB gettextlib)
+  ELSE(CMAKE_CL_64)
+  	SET(GETTEXT_LIB gnu_gettext)
+  ENDIF(CMAKE_CL_64)
   SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
 
   SET(FREETYPE ${LIBDIR}/freetype)
@@ -279,7 +283,12 @@
   SET(FFMPEG_LIB avcodec-51 avformat-52 avdevice-52 avutil-49 swscale-0)
   SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
 
+  IF(CMAKE_CL_64)
+  SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
+  ELSE(CMAKE_CL_64)
   SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
+  ENDIF(CMAKE_CL_64)
+  
   IF(WITH_OPENAL)
     SET(LLIBS ${LLIBS} dxguid)
   ENDIF(WITH_OPENAL)
@@ -317,7 +326,7 @@
   SET(WINTAB_INC ${LIBDIR}/wintab/include) 
 
   IF(CMAKE_CL_64)
-  SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib;MSVCRT.lib ")
+  SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
   ELSE(CMAKE_CL_64)
   SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
   ENDIF(CMAKE_CL_64)

Modified: branches/soc-2008-unclezeiv/blenderplayer/CMakeLists.txt
===================================================================
--- branches/soc-2008-unclezeiv/blenderplayer/CMakeLists.txt	2008-09-07 04:43:31 UTC (rev 16401)
+++ branches/soc-2008-unclezeiv/blenderplayer/CMakeLists.txt	2008-09-07 07:59:06 UTC (rev 16402)
@@ -90,6 +90,7 @@
     bf_soundsystem 
     bf_kernel 
     bf_nodes
+	bf_gpu
     bf_imbuf
     bf_avi 
     kx_network 

Modified: branches/soc-2008-unclezeiv/config/darwin-config.py
===================================================================
--- branches/soc-2008-unclezeiv/config/darwin-config.py	2008-09-07 04:43:31 UTC (rev 16401)
+++ branches/soc-2008-unclezeiv/config/darwin-config.py	2008-09-07 07:59:06 UTC (rev 16402)
@@ -143,7 +143,6 @@
 
 WITH_BF_GAMEENGINE='true'
 WITH_BF_PLAYER='true'
-WITH_BF_GLEXT= '1'
 
 WITH_BF_ODE = 'false'
 BF_ODE = LIBDIR + '/ode'

Modified: branches/soc-2008-unclezeiv/extern/glew/SConscript
===================================================================
--- branches/soc-2008-unclezeiv/extern/glew/SConscript	2008-09-07 04:43:31 UTC (rev 16401)
+++ branches/soc-2008-unclezeiv/extern/glew/SConscript	2008-09-07 07:59:06 UTC (rev 16402)
@@ -9,4 +9,4 @@
 defs = ''
 incs = 'include'
 
-env.BlenderLib ( 'extern_glew', sources, Split(incs), Split(defs), libtype=['intern', 'player'], priority=[25, 50])
+env.BlenderLib ( 'extern_glew', sources, Split(incs), Split(defs), libtype=['blender', 'player'], priority=[50, 50])

Modified: branches/soc-2008-unclezeiv/extern/glew/include/GL/glew.h
===================================================================
--- branches/soc-2008-unclezeiv/extern/glew/include/GL/glew.h	2008-09-07 04:43:31 UTC (rev 16401)
+++ branches/soc-2008-unclezeiv/extern/glew/include/GL/glew.h	2008-09-07 07:59:06 UTC (rev 16402)
@@ -58,8 +58,11 @@
 ** version 1.2.1 Specification.
 */
 
-/* added this here for blender, should be moved elsewhere */
+#define BLENDER_CHANGES
+
+#ifdef BLENDER_CHANGES
 #define GLEW_STATIC
+#endif
 
 #ifndef __glew_h__
 #define __glew_h__
@@ -1805,6 +1808,7 @@
 typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort* v);
 typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* pointer);
 
+#ifndef BLENDER_CHANGES
 #define glAttachShader GLEW_GET_FUN(__glewAttachShader)
 #define glBindAttribLocation GLEW_GET_FUN(__glewBindAttribLocation)
 #define glBlendEquationSeparate GLEW_GET_FUN(__glewBlendEquationSeparate)
@@ -1898,6 +1902,7 @@
 #define glVertexAttrib4uiv GLEW_GET_FUN(__glewVertexAttrib4uiv)
 #define glVertexAttrib4usv GLEW_GET_FUN(__glewVertexAttrib4usv)
 #define glVertexAttribPointer GLEW_GET_FUN(__glewVertexAttribPointer)
+#endif
 
 #define GLEW_VERSION_2_0 GLEW_GET_VAR(__GLEW_VERSION_2_0)
 

Modified: branches/soc-2008-unclezeiv/extern/glew/src/glew.c
===================================================================
--- branches/soc-2008-unclezeiv/extern/glew/src/glew.c	2008-09-07 04:43:31 UTC (rev 16401)
+++ branches/soc-2008-unclezeiv/extern/glew/src/glew.c	2008-09-07 07:59:06 UTC (rev 16402)
@@ -1836,6 +1836,7 @@
 {
   GLboolean r = GL_FALSE;
 
+#ifndef BLENDER_CHANGES
   r = ((glAttachShader = (PFNGLATTACHSHADERPROC)glewGetProcAddress((const GLubyte*)"glAttachShader")) == NULL) || r;
   r = ((glBindAttribLocation = (PFNGLBINDATTRIBLOCATIONPROC)glewGetProcAddress((const GLubyte*)"glBindAttribLocation")) == NULL) || r;
   r = ((glBlendEquationSeparate = (PFNGLBLENDEQUATIONSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationSeparate")) == NULL) || r;
@@ -1929,6 +1930,7 @@
   r = ((glVertexAttrib4uiv = (PFNGLVERTEXATTRIB4UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4uiv")) == NULL) || r;
   r = ((glVertexAttrib4usv = (PFNGLVERTEXATTRIB4USVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4usv")) == NULL) || r;
   r = ((glVertexAttribPointer = (PFNGLVERTEXATTRIBPOINTERPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribPointer")) == NULL) || r;
+#endif
 
   return r;
 }

Modified: branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_SystemWin32.cpp	2008-09-07 04:43:31 UTC (rev 16401)
+++ branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_SystemWin32.cpp	2008-09-07 07:59:06 UTC (rev 16402)
@@ -917,8 +917,12 @@
 	char *buffer;
 	char *temp_buff;
 	
-	if ( OpenClipboard(NULL) ) {
+	if ( IsClipboardFormatAvailable(CF_TEXT) && OpenClipboard(NULL) ) {
 		HANDLE hData = GetClipboardData( CF_TEXT );
+		if (hData == NULL) {
+			CloseClipboard();
+			return NULL;
+		}
 		buffer = (char*)GlobalLock( hData );
 		
 		temp_buff = (char*) malloc(strlen(buffer)+1);

Modified: branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_WindowWin32.cpp	2008-09-07 04:43:31 UTC (rev 16401)
+++ branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_WindowWin32.cpp	2008-09-07 07:59:06 UTC (rev 16402)
@@ -437,7 +437,13 @@
 	// adding a glFinish() here is to prevent Geforce in 'full scene antialias' mode
 	// from antialising the Blender window. Officially a swapbuffers does a glFinish
 	// itself, so this feels really like a hack... but it won't harm. (ton)
-	glFinish();
+	// 
+	// disabled this because it is a performance killer for the game engine, glFinish
+	// forces synchronization with the graphics card and calling it is strongly
+	// discouraged for good performance. (brecht)
+	//
+	// glFinish();
+
 	return ::SwapBuffers(m_hDC) == TRUE ? GHOST_kSuccess : GHOST_kFailure;
 }
 

Modified: branches/soc-2008-unclezeiv/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- branches/soc-2008-unclezeiv/intern/guardedalloc/MEM_guardedalloc.h	2008-09-07 04:43:31 UTC (rev 16401)
+++ branches/soc-2008-unclezeiv/intern/guardedalloc/MEM_guardedalloc.h	2008-09-07 07:59:06 UTC (rev 16402)
@@ -58,8 +58,8 @@
 #ifndef MEM_MALLOCN_H
 #define MEM_MALLOCN_H
 
-/* Needed for FILE* */
-#include "stdio.h"
+#include "stdio.h" /* needed for FILE* */
+#include "BLO_sys_types.h" /* needed for uintptr_t */
 
 #ifdef __cplusplus
 extern "C" {
@@ -123,6 +123,12 @@
 	/** Attempt to enforce OSX (or other OS's) to have malloc and stack nonzero */
 	void MEM_set_memory_debug(void);
 
+	/* Memory usage stats
+	 * - MEM_get_memory_in_use is all memory
+	 * - MEM_get_mapped_memory_in_use is a subset of all memory */
+	uintptr_t MEM_get_memory_in_use(void);
+	uintptr_t MEM_get_mapped_memory_in_use(void);
+	int MEM_get_memory_blocks_in_use(void);
 
 #ifdef __cplusplus
 }

Modified: branches/soc-2008-unclezeiv/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/soc-2008-unclezeiv/intern/guardedalloc/intern/mallocn.c	2008-09-07 04:43:31 UTC (rev 16401)
+++ branches/soc-2008-unclezeiv/intern/guardedalloc/intern/mallocn.c	2008-09-07 07:59:06 UTC (rev 16402)
@@ -49,8 +49,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLO_sys_types.h" // needed for intptr_t
-
 /* --------------------------------------------------------------------- */
 /* Data definition                                                       */
 /* --------------------------------------------------------------------- */
@@ -113,8 +111,8 @@
 /* --------------------------------------------------------------------- */
 	
 
-volatile int totblock= 0;
-volatile uintptr_t mem_in_use= 0, mmap_in_use= 0;
+static volatile int totblock= 0;
+static volatile uintptr_t mem_in_use= 0, mmap_in_use= 0;
 
 static volatile struct localListBase _membase;
 static volatile struct localListBase *membase = &_membase;
@@ -698,4 +696,19 @@
 	return(name);
 }
 
+uintptr_t MEM_get_memory_in_use(void)
+{
+	return mem_in_use;
+}
+
+uintptr_t MEM_get_mapped_memory_in_use(void)
+{
+	return mmap_in_use;
+}
+
+int MEM_get_memory_blocks_in_use(void)
+{
+	return totblock;
+}
+
 /* eof */

Modified: branches/soc-2008-unclezeiv/intern/memutil/MEM_Allocator.h
===================================================================

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list