[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16369] branches/sim_physics: svn merge -r 16351:16368 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Daniel Genrich daniel.genrich at gmx.net
Fri Sep 5 01:33:23 CEST 2008


Revision: 16369
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16369
Author:   genscher
Date:     2008-09-05 01:33:19 +0200 (Fri, 05 Sep 2008)

Log Message:
-----------
svn merge -r 16351:16368 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Modified Paths:
--------------
    branches/sim_physics/blenderplayer/CMakeLists.txt
    branches/sim_physics/config/darwin-config.py
    branches/sim_physics/extern/glew/SConscript
    branches/sim_physics/extern/glew/include/GL/glew.h
    branches/sim_physics/extern/glew/src/glew.c
    branches/sim_physics/intern/guardedalloc/MEM_guardedalloc.h
    branches/sim_physics/intern/guardedalloc/intern/mallocn.c
    branches/sim_physics/intern/memutil/MEM_Allocator.h
    branches/sim_physics/intern/memutil/MEM_CacheLimiter.h
    branches/sim_physics/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
    branches/sim_physics/intern/moto/include/GEN_Map.h
    branches/sim_physics/intern/moto/include/MT_Matrix4x4.h
    branches/sim_physics/intern/moto/include/MT_Matrix4x4.inl
    branches/sim_physics/release/scripts/sysinfo.py
    branches/sim_physics/source/Makefile
    branches/sim_physics/source/blender/CMakeLists.txt
    branches/sim_physics/source/blender/Makefile
    branches/sim_physics/source/blender/SConscript
    branches/sim_physics/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/sim_physics/source/blender/blenkernel/BKE_bad_level_calls.h
    branches/sim_physics/source/blender/blenkernel/BKE_colortools.h
    branches/sim_physics/source/blender/blenkernel/BKE_global.h
    branches/sim_physics/source/blender/blenkernel/BKE_mesh.h
    branches/sim_physics/source/blender/blenkernel/BKE_node.h
    branches/sim_physics/source/blender/blenkernel/BKE_texture.h
    branches/sim_physics/source/blender/blenkernel/BKE_utildefines.h
    branches/sim_physics/source/blender/blenkernel/CMakeLists.txt
    branches/sim_physics/source/blender/blenkernel/SConscript
    branches/sim_physics/source/blender/blenkernel/bad_level_call_stubs/stubs.c
    branches/sim_physics/source/blender/blenkernel/intern/DerivedMesh.c
    branches/sim_physics/source/blender/blenkernel/intern/Makefile
    branches/sim_physics/source/blender/blenkernel/intern/action.c
    branches/sim_physics/source/blender/blenkernel/intern/anim.c
    branches/sim_physics/source/blender/blenkernel/intern/blender.c
    branches/sim_physics/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/sim_physics/source/blender/blenkernel/intern/colortools.c
    branches/sim_physics/source/blender/blenkernel/intern/image.c
    branches/sim_physics/source/blender/blenkernel/intern/ipo.c
    branches/sim_physics/source/blender/blenkernel/intern/material.c
    branches/sim_physics/source/blender/blenkernel/intern/mesh.c
    branches/sim_physics/source/blender/blenkernel/intern/node.c
    branches/sim_physics/source/blender/blenkernel/intern/object.c
    branches/sim_physics/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/sim_physics/source/blender/blenkernel/intern/texture.c
    branches/sim_physics/source/blender/blenlib/BLI_arithb.h
    branches/sim_physics/source/blender/blenlib/BLI_blenlib.h
    branches/sim_physics/source/blender/blenlib/intern/arithb.c
    branches/sim_physics/source/blender/blenloader/intern/readfile.c
    branches/sim_physics/source/blender/gpu/CMakeLists.txt
    branches/sim_physics/source/blender/gpu/GPU_draw.h
    branches/sim_physics/source/blender/gpu/GPU_extensions.h
    branches/sim_physics/source/blender/gpu/GPU_material.h
    branches/sim_physics/source/blender/gpu/Makefile
    branches/sim_physics/source/blender/gpu/SConscript
    branches/sim_physics/source/blender/gpu/intern/Makefile
    branches/sim_physics/source/blender/gpu/intern/gpu_codegen.c
    branches/sim_physics/source/blender/gpu/intern/gpu_codegen.h
    branches/sim_physics/source/blender/gpu/intern/gpu_draw.c
    branches/sim_physics/source/blender/gpu/intern/gpu_extensions.c
    branches/sim_physics/source/blender/gpu/intern/gpu_material.c
    branches/sim_physics/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/sim_physics/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/sim_physics/source/blender/gpu/intern/gpu_shader_vertex.glsl
    branches/sim_physics/source/blender/gpu/intern/gpu_shader_vertex.glsl.c
    branches/sim_physics/source/blender/include/BDR_drawmesh.h
    branches/sim_physics/source/blender/include/BDR_drawobject.h
    branches/sim_physics/source/blender/include/BDR_imagepaint.h
    branches/sim_physics/source/blender/include/BIF_drawtext.h
    branches/sim_physics/source/blender/include/BIF_gl.h
    branches/sim_physics/source/blender/include/BIF_meshtools.h
    branches/sim_physics/source/blender/include/BSE_drawview.h
    branches/sim_physics/source/blender/makesdna/DNA_actuator_types.h
    branches/sim_physics/source/blender/makesdna/DNA_brush_types.h
    branches/sim_physics/source/blender/makesdna/DNA_group_types.h
    branches/sim_physics/source/blender/makesdna/DNA_image_types.h
    branches/sim_physics/source/blender/makesdna/DNA_ipo_types.h
    branches/sim_physics/source/blender/makesdna/DNA_lamp_types.h
    branches/sim_physics/source/blender/makesdna/DNA_material_types.h
    branches/sim_physics/source/blender/makesdna/DNA_object_types.h
    branches/sim_physics/source/blender/makesdna/DNA_scene_types.h
    branches/sim_physics/source/blender/makesdna/DNA_sensor_types.h
    branches/sim_physics/source/blender/makesdna/DNA_texture_types.h
    branches/sim_physics/source/blender/makesdna/DNA_userdef_types.h
    branches/sim_physics/source/blender/makesdna/DNA_world_types.h
    branches/sim_physics/source/blender/nodes/CMakeLists.txt
    branches/sim_physics/source/blender/nodes/SConscript
    branches/sim_physics/source/blender/nodes/intern/CMP_nodes/Makefile
    branches/sim_physics/source/blender/nodes/intern/Makefile
    branches/sim_physics/source/blender/nodes/intern/SHD_nodes/Makefile
    branches/sim_physics/source/blender/nodes/intern/SHD_nodes/SHD_camera.c
    branches/sim_physics/source/blender/nodes/intern/SHD_nodes/SHD_curves.c
    branches/sim_physics/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
    branches/sim_physics/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
    branches/sim_physics/source/blender/nodes/intern/SHD_nodes/SHD_invert.c
    branches/sim_physics/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c
    branches/sim_physics/source/blender/nodes/intern/SHD_nodes/SHD_material.c
    branches/sim_physics/source/blender/nodes/intern/SHD_nodes/SHD_math.c
    branches/sim_physics/source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c
    branches/sim_physics/source/blender/nodes/intern/SHD_nodes/SHD_normal.c
    branches/sim_physics/source/blender/nodes/intern/SHD_nodes/SHD_output.c
    branches/sim_physics/source/blender/nodes/intern/SHD_nodes/SHD_rgb.c
    branches/sim_physics/source/blender/nodes/intern/SHD_nodes/SHD_sepcombRGB.c
    branches/sim_physics/source/blender/nodes/intern/SHD_nodes/SHD_squeeze.c
    branches/sim_physics/source/blender/nodes/intern/SHD_nodes/SHD_texture.c
    branches/sim_physics/source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c
    branches/sim_physics/source/blender/nodes/intern/SHD_nodes/SHD_value.c
    branches/sim_physics/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
    branches/sim_physics/source/blender/nodes/intern/SHD_util.h
    branches/sim_physics/source/blender/python/BPY_interface.c
    branches/sim_physics/source/blender/python/CMakeLists.txt
    branches/sim_physics/source/blender/python/SConscript
    branches/sim_physics/source/blender/python/api2_2x/Blender.c
    branches/sim_physics/source/blender/python/api2_2x/Group.c
    branches/sim_physics/source/blender/python/api2_2x/Image.c
    branches/sim_physics/source/blender/python/api2_2x/Lamp.c
    branches/sim_physics/source/blender/python/api2_2x/MTex.c
    branches/sim_physics/source/blender/python/api2_2x/Makefile
    branches/sim_physics/source/blender/python/api2_2x/Material.c
    branches/sim_physics/source/blender/python/api2_2x/doc/Group.py
    branches/sim_physics/source/blender/radiosity/CMakeLists.txt
    branches/sim_physics/source/blender/radiosity/SConscript
    branches/sim_physics/source/blender/radiosity/intern/source/Makefile
    branches/sim_physics/source/blender/render/intern/include/render_types.h
    branches/sim_physics/source/blender/render/intern/source/pipeline.c
    branches/sim_physics/source/blender/render/intern/source/rayshade.c
    branches/sim_physics/source/blender/render/intern/source/shadbuf.c
    branches/sim_physics/source/blender/render/intern/source/shadeoutput.c
    branches/sim_physics/source/blender/render/intern/source/zbuf.c
    branches/sim_physics/source/blender/src/CMakeLists.txt
    branches/sim_physics/source/blender/src/Makefile
    branches/sim_physics/source/blender/src/SConscript
    branches/sim_physics/source/blender/src/buttons_logic.c
    branches/sim_physics/source/blender/src/buttons_object.c
    branches/sim_physics/source/blender/src/buttons_shading.c
    branches/sim_physics/source/blender/src/drawarmature.c
    branches/sim_physics/source/blender/src/drawmesh.c
    branches/sim_physics/source/blender/src/drawobject.c
    branches/sim_physics/source/blender/src/drawtext.c
    branches/sim_physics/source/blender/src/drawview.c
    branches/sim_physics/source/blender/src/editdeform.c
    branches/sim_physics/source/blender/src/editface.c
    branches/sim_physics/source/blender/src/editipo_lib.c
    branches/sim_physics/source/blender/src/editlattice.c
    branches/sim_physics/source/blender/src/editmode_undo.c
    branches/sim_physics/source/blender/src/editview.c
    branches/sim_physics/source/blender/src/header_image.c
    branches/sim_physics/source/blender/src/header_info.c
    branches/sim_physics/source/blender/src/header_view3d.c
    branches/sim_physics/source/blender/src/headerbuttons.c
    branches/sim_physics/source/blender/src/imagepaint.c
    branches/sim_physics/source/blender/src/meshtools.c
    branches/sim_physics/source/blender/src/playanim.c
    branches/sim_physics/source/blender/src/previewrender.c
    branches/sim_physics/source/blender/src/renderwin.c
    branches/sim_physics/source/blender/src/sculptmode.c
    branches/sim_physics/source/blender/src/sequence.c
    branches/sim_physics/source/blender/src/space.c
    branches/sim_physics/source/blender/src/toets.c
    branches/sim_physics/source/blender/src/usiblender.c
    branches/sim_physics/source/blender/src/verse_image.c
    branches/sim_physics/source/blender/yafray/intern/export_File.cpp
    branches/sim_physics/source/blender/yafray/intern/export_Plugin.cpp
    branches/sim_physics/source/creator/CMakeLists.txt
    branches/sim_physics/source/creator/Makefile
    branches/sim_physics/source/creator/SConscript
    branches/sim_physics/source/creator/creator.c
    branches/sim_physics/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/sim_physics/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/sim_physics/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/sim_physics/source/gameengine/BlenderRoutines/KX_BlenderGL.h
    branches/sim_physics/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/sim_physics/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
    branches/sim_physics/source/gameengine/BlenderRoutines/Makefile
    branches/sim_physics/source/gameengine/BlenderRoutines/SConscript
    branches/sim_physics/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/sim_physics/source/gameengine/Converter/BL_ArmatureObject.h
    branches/sim_physics/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/sim_physics/source/gameengine/Converter/BL_DeformableGameObject.cpp
    branches/sim_physics/source/gameengine/Converter/BL_MeshDeformer.cpp
    branches/sim_physics/source/gameengine/Converter/BL_MeshDeformer.h
    branches/sim_physics/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/sim_physics/source/gameengine/Converter/BL_ShapeDeformer.cpp
    branches/sim_physics/source/gameengine/Converter/BL_ShapeDeformer.h
    branches/sim_physics/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/sim_physics/source/gameengine/Converter/BL_SkinDeformer.h
    branches/sim_physics/source/gameengine/Converter/BL_SkinMeshObject.cpp
    branches/sim_physics/source/gameengine/Converter/BL_SkinMeshObject.h
    branches/sim_physics/source/gameengine/Converter/CMakeLists.txt
    branches/sim_physics/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/sim_physics/source/gameengine/Converter/KX_BlenderSceneConverter.h
    branches/sim_physics/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/sim_physics/source/gameengine/Converter/Makefile
    branches/sim_physics/source/gameengine/Converter/SConscript
    branches/sim_physics/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
    branches/sim_physics/source/gameengine/GamePlayer/common/CMakeLists.txt
    branches/sim_physics/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/sim_physics/source/gameengine/GamePlayer/common/GPC_RenderTools.h
    branches/sim_physics/source/gameengine/GamePlayer/common/Makefile
    branches/sim_physics/source/gameengine/GamePlayer/common/SConscript
    branches/sim_physics/source/gameengine/GamePlayer/common/unix/GPU_PolygonMaterial.h
    branches/sim_physics/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/sim_physics/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/sim_physics/source/gameengine/GamePlayer/ghost/GPG_Application.h
    branches/sim_physics/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/sim_physics/source/gameengine/GamePlayer/ghost/Makefile
    branches/sim_physics/source/gameengine/GamePlayer/ghost/SConscript
    branches/sim_physics/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
    branches/sim_physics/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/sim_physics/source/gameengine/Ketsji/BL_BlenderShader.h
    branches/sim_physics/source/gameengine/Ketsji/BL_Material.h
    branches/sim_physics/source/gameengine/Ketsji/BL_Shader.cpp
    branches/sim_physics/source/gameengine/Ketsji/BL_Shader.h
    branches/sim_physics/source/gameengine/Ketsji/CMakeLists.txt
    branches/sim_physics/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/sim_physics/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_GameObject.h
    branches/sim_physics/source/gameengine/Ketsji/KX_ISceneConverter.h
    branches/sim_physics/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/sim_physics/source/gameengine/Ketsji/KX_Light.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_Light.h
    branches/sim_physics/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_PolyProxy.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_PolygonMaterial.h
    branches/sim_physics/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_PythonInit.h
    branches/sim_physics/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_Scene.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_Scene.h
    branches/sim_physics/source/gameengine/Ketsji/KX_VertexProxy.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
    branches/sim_physics/source/gameengine/Ketsji/Makefile
    branches/sim_physics/source/gameengine/Ketsji/SConscript
    branches/sim_physics/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/sim_physics/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/sim_physics/source/gameengine/PyDoc/GameLogic.py
    branches/sim_physics/source/gameengine/PyDoc/Rasterizer.py
    branches/sim_physics/source/gameengine/Rasterizer/Makefile
    branches/sim_physics/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    branches/sim_physics/source/gameengine/Rasterizer/RAS_BucketManager.h
    branches/sim_physics/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
    branches/sim_physics/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/sim_physics/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/sim_physics/source/gameengine/Rasterizer/RAS_IRenderTools.cpp
    branches/sim_physics/source/gameengine/Rasterizer/RAS_IRenderTools.h
    branches/sim_physics/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
    branches/sim_physics/source/gameengine/Rasterizer/RAS_MaterialBucket.h
    branches/sim_physics/source/gameengine/Rasterizer/RAS_MeshObject.cpp
    branches/sim_physics/source/gameengine/Rasterizer/RAS_MeshObject.h
    branches/sim_physics/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    branches/sim_physics/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
    branches/sim_physics/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
    branches/sim_physics/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
    branches/sim_physics/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/sim_physics/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/sim_physics/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
    branches/sim_physics/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
    branches/sim_physics/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
    branches/sim_physics/source/gameengine/Rasterizer/RAS_Polygon.cpp
    branches/sim_physics/source/gameengine/Rasterizer/RAS_Polygon.h
    branches/sim_physics/source/gameengine/Rasterizer/RAS_TexVert.cpp
    branches/sim_physics/source/gameengine/Rasterizer/RAS_TexVert.h
    branches/sim_physics/source/gameengine/Rasterizer/SConscript
    branches/sim_physics/source/kernel/gen_system/GEN_Map.h
    branches/sim_physics/source/nan_definitions.mk
    branches/sim_physics/tools/btools.py

Added Paths:
-----------
    branches/sim_physics/source/blender/gpu/
    branches/sim_physics/source/blender/gpu/intern/

Removed Paths:
-------------
    branches/sim_physics/source/blender/gpu/intern/

Modified: branches/sim_physics/blenderplayer/CMakeLists.txt
===================================================================
--- branches/sim_physics/blenderplayer/CMakeLists.txt	2008-09-04 23:07:43 UTC (rev 16368)
+++ branches/sim_physics/blenderplayer/CMakeLists.txt	2008-09-04 23:33:19 UTC (rev 16369)
@@ -90,6 +90,7 @@
     bf_soundsystem 
     bf_kernel 
     bf_nodes
+	bf_gpu
     bf_imbuf
     bf_avi 
     kx_network 

Modified: branches/sim_physics/config/darwin-config.py
===================================================================
--- branches/sim_physics/config/darwin-config.py	2008-09-04 23:07:43 UTC (rev 16368)
+++ branches/sim_physics/config/darwin-config.py	2008-09-04 23:33:19 UTC (rev 16369)
@@ -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/sim_physics/extern/glew/SConscript
===================================================================
--- branches/sim_physics/extern/glew/SConscript	2008-09-04 23:07:43 UTC (rev 16368)
+++ branches/sim_physics/extern/glew/SConscript	2008-09-04 23:33:19 UTC (rev 16369)
@@ -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/sim_physics/extern/glew/include/GL/glew.h
===================================================================
--- branches/sim_physics/extern/glew/include/GL/glew.h	2008-09-04 23:07:43 UTC (rev 16368)
+++ branches/sim_physics/extern/glew/include/GL/glew.h	2008-09-04 23:33:19 UTC (rev 16369)
@@ -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/sim_physics/extern/glew/src/glew.c
===================================================================
--- branches/sim_physics/extern/glew/src/glew.c	2008-09-04 23:07:43 UTC (rev 16368)
+++ branches/sim_physics/extern/glew/src/glew.c	2008-09-04 23:33:19 UTC (rev 16369)
@@ -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/sim_physics/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- branches/sim_physics/intern/guardedalloc/MEM_guardedalloc.h	2008-09-04 23:07:43 UTC (rev 16368)
+++ branches/sim_physics/intern/guardedalloc/MEM_guardedalloc.h	2008-09-04 23:33:19 UTC (rev 16369)
@@ -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/sim_physics/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/sim_physics/intern/guardedalloc/intern/mallocn.c	2008-09-04 23:07:43 UTC (rev 16368)
+++ branches/sim_physics/intern/guardedalloc/intern/mallocn.c	2008-09-04 23:33:19 UTC (rev 16369)
@@ -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/sim_physics/intern/memutil/MEM_Allocator.h
===================================================================
--- branches/sim_physics/intern/memutil/MEM_Allocator.h	2008-09-04 23:07:43 UTC (rev 16368)
+++ branches/sim_physics/intern/memutil/MEM_Allocator.h	2008-09-04 23:33:19 UTC (rev 16369)
@@ -25,6 +25,7 @@
 #define __MEM_Allocator_h_included__ 1
 
 #include "guardedalloc/MEM_guardedalloc.h"
+#include "guardedalloc/BLO_sys_types.h"
 
 #ifdef _MSC_VER
 #if _MSC_VER < 1300 // 1200 == VC++ 6.0 according to boost

Modified: branches/sim_physics/intern/memutil/MEM_CacheLimiter.h
===================================================================
--- branches/sim_physics/intern/memutil/MEM_CacheLimiter.h	2008-09-04 23:07:43 UTC (rev 16368)
+++ branches/sim_physics/intern/memutil/MEM_CacheLimiter.h	2008-09-04 23:33:19 UTC (rev 16369)
@@ -61,11 +61,8 @@
 
 #ifndef __MEM_cache_limiter_c_api_h_included__
 extern "C" {
-	extern void MEM_CacheLimiter_set_maximum(int m);
-	extern int MEM_CacheLimiter_get_maximum();
-        // this is rather _ugly_!
-        extern int mem_in_use;
-	extern int mmap_in_use;
+	extern void MEM_CacheLimiter_set_maximum(intptr_t m);
+	extern intptr_t MEM_CacheLimiter_get_maximum();
 };
 #endif
 
@@ -141,7 +138,10 @@
 		delete handle;
 	}
 	void enforce_limits() {
-		int max = MEM_CacheLimiter_get_maximum();
+		intptr_t max = MEM_CacheLimiter_get_maximum();
+		intptr_t mem_in_use= MEM_get_memory_in_use();
+		intptr_t mmap_in_use= MEM_get_mapped_memory_in_use();
+
 		if (max == 0) {
 			return;
 		}

Modified: branches/sim_physics/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
===================================================================
--- branches/sim_physics/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp	2008-09-04 23:07:43 UTC (rev 16368)
+++ branches/sim_physics/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp	2008-09-04 23:33:19 UTC (rev 16369)
@@ -27,18 +27,18 @@
 #include "MEM_CacheLimiter.h"
 #include "MEM_CacheLimiterC-Api.h"
 
-static int & get_max() 
+static intptr_t & get_max() 
 {
-	static int m = 32*1024*1024;
+	static intptr_t m = 32*1024*1024;
 	return m;
 }
 
-void MEM_CacheLimiter_set_maximum(int m)
+void MEM_CacheLimiter_set_maximum(intptr_t m)
 {
 	get_max() = m;
 }
 
-int MEM_CacheLimiter_get_maximum()
+intptr_t MEM_CacheLimiter_get_maximum()
 {
 	return get_max();
 }

Modified: branches/sim_physics/intern/moto/include/GEN_Map.h
===================================================================
--- branches/sim_physics/intern/moto/include/GEN_Map.h	2008-09-04 23:07:43 UTC (rev 16368)
+++ branches/sim_physics/intern/moto/include/GEN_Map.h	2008-09-04 23:33:19 UTC (rev 16369)
@@ -50,6 +50,19 @@
             m_buckets[i] = 0;
         }
     }
+
+	GEN_Map(const GEN_Map& map)
+	{
+		m_num_buckets = map.m_num_buckets;
+		m_buckets = new Entry *[m_num_buckets];
+
+		for (int i = 0; i < m_num_buckets; ++i) {
+			m_buckets[i] = 0;
+
+			for(Entry *entry = map.m_buckets[i]; entry; entry=entry->m_next)
+				insert(entry->m_key, entry->m_value);
+		}
+	}
     
     int size() { 
         int count=0;

Modified: branches/sim_physics/intern/moto/include/MT_Matrix4x4.h
===================================================================
--- branches/sim_physics/intern/moto/include/MT_Matrix4x4.h	2008-09-04 23:07:43 UTC (rev 16368)
+++ branches/sim_physics/intern/moto/include/MT_Matrix4x4.h	2008-09-04 23:33:19 UTC (rev 16369)
@@ -212,6 +212,7 @@
 	MT_Matrix4x4 transposed() const; 
 	void         transpose();
 
+	MT_Matrix4x4 inverse() const;
 	void         invert();
   
 protected:

Modified: branches/sim_physics/intern/moto/include/MT_Matrix4x4.inl
===================================================================
--- branches/sim_physics/intern/moto/include/MT_Matrix4x4.inl	2008-09-04 23:07:43 UTC (rev 16368)
+++ branches/sim_physics/intern/moto/include/MT_Matrix4x4.inl	2008-09-04 23:33:19 UTC (rev 16369)
@@ -52,15 +52,15 @@
 		}
 }
 
-/* We do things slightly different here, because the invert() modifies
- * the buffer itself. This makes it impossible to make this op right
- * away. Like other, still missing facilities, I will repair this
- * later. */

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list