svn merge -r41899:41926 ^/trunk/blender. also sync mempool with trunk and move BLI_me...
authorCampbell Barton <ideasman42@gmail.com>
Wed, 16 Nov 2011 19:06:38 +0000 (19:06 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 16 Nov 2011 19:06:38 +0000 (19:06 +0000)
commit9d05ccf9e84510ca7e3fe140f6e20991a931b8ce
treef8f7241b779c9049d853a5e824db2dd150228ebe
parent707fcc42a390e91aedd858588c30d04fea43f0e6
parent1af839081b7adcc3ceb13e5e7cc579b309e90915
svn merge -r41899:41926 ^/trunk/blender. also sync mempool with trunk and move BLI_mempool_alloc out of mempools header where it was inlined
16 files changed:
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenlib/BLI_mempool.h
source/blender/blenlib/intern/BLI_mempool.c
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/bmesh_operator_api.h
source/blender/bmesh/intern/bmesh_newcore.c
source/blender/bmesh/intern/bmesh_walkers.c
source/blender/bmesh/operators/subdivideop.c
source/blender/editors/mesh/knifetool.c
source/blender/modifiers/intern/MOD_array.c
source/blender/modifiers/intern/MOD_fluidsim_util.c
source/blender/modifiers/intern/MOD_ocean.c
source/blender/render/intern/source/render_texture.c