merge with 2.5 at r20783
authorJoseph Eagar <joeedh@gmail.com>
Wed, 10 Jun 2009 19:15:27 +0000 (19:15 +0000)
committerJoseph Eagar <joeedh@gmail.com>
Wed, 10 Jun 2009 19:15:27 +0000 (19:15 +0000)
commitfc79b456fdb505740495626f7d97145712c6723f
treed24697814ca59309f796d99b553b292b50847e7a
parent994a8bd80f67910791a3ffd2b92755fefe94eaf1
parentfba6a9931c81e8cc6a3ea5d3cbd466f2d759c514
merge with 2.5 at r20783
47 files changed:
SConstruct
config/win32-vc-config.py
intern/guardedalloc/intern/mmap_win.c
projectfiles_vc9/blender/blender.sln
projectfiles_vc9/blender/editors/ED_editors.vcproj
source/blender/SConscript
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/BKE_modifier.h
source/blender/blenkernel/BKE_multires.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/exotic.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/multires.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/shrinkwrap.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenlib/BLI_arithb.h
source/blender/blenlib/intern/arithb.c
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/intern/bmesh_opdefines.c
source/blender/editors/armature/reeb.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/meshtools.c
source/blender/editors/object/object_edit.c
source/blender/editors/physics/editparticle.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_image/image_header.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/makesrna/intern/makesrna.c
source/blender/python/intern/bpy_rna.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/shadeoutput.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp
tools/Blender.py
tools/btools.py