Merging r58778 through r59080 from trunk into soc-2013-depsgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 12 Aug 2013 09:35:16 +0000 (09:35 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 12 Aug 2013 09:35:16 +0000 (09:35 +0000)
26 files changed:
1  2 
intern/guardedalloc/intern/mallocn.c
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/key.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle.c
source/blender/blenlib/intern/BLI_mempool.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/meshtools.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_modifier.c
source/blender/editors/render/render_internal.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/gpu/intern/gpu_buffers.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pointdensity.c
source/blender/windowmanager/WM_api.h
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp

Simple merge
index 158335b85186061e27c1aa6ff841deb79704f558,c54f937f4a917f0c994725192c678fc18cd75ca5..4420c260eedf434fb277579b70039db541a955fe
@@@ -190,12 -197,14 +199,17 @@@ void GPU_global_buffer_pool_free(void
        gpu_buffer_pool = NULL;
  }
  
+ void GPU_global_buffer_pool_free_unused(void)
+ {
+       gpu_buffer_pool_free_unused(gpu_buffer_pool);
+ }
  /* get a GPUBuffer of at least `size' bytes; uses one from the buffer
 - * pool if possible, otherwise creates a new one */
 -GPUBuffer *GPU_buffer_alloc(int size)
 + * pool if possible, otherwise creates a new one
 + *
 + * Thread-unsafe version for internal usage only.
 + */
 +static GPUBuffer *gpu_buffer_alloc_intern(int size)
  {
        GPUBufferPool *pool;
        GPUBuffer *buf;
Simple merge