merge with 2.5 (not trunk, last merge message said that on accident) at r22252
authorJoseph Eagar <joeedh@gmail.com>
Thu, 6 Aug 2009 09:56:14 +0000 (09:56 +0000)
committerJoseph Eagar <joeedh@gmail.com>
Thu, 6 Aug 2009 09:56:14 +0000 (09:56 +0000)
commit38de6d14e4e7a55a4109313942df3ae9211b1aeb
tree83288d248bc7a4794b8b34e607f3e319e905b381
parent416a3bf4a14a951642cace5ee8033c4c20dd9f66
parent1e4fb484001994f4e164aab7b44c9578df59f67d
Merge ... 2.5 (not trunk, last merge message said that on accident) at r22252
56 files changed:
SConstruct
projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
projectfiles_vc9/blender/blender.sln
projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
projectfiles_vc9/blender/editors/ED_editors.vcproj
projectfiles_vc9/blender/makesdna/DNA_makesdna.vcproj
source/blender/blenkernel/BKE_modifier.h
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/exotic.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenlib/BLI_arithb.h
source/blender/blenlib/intern/arithb.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/armature/meshlaplacian.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/mesh/editmesh_add.c
source/blender/editors/mesh/editmesh_loop.c
source/blender/editors/mesh/editmesh_mods.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/mesh_ops.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/space_buttons/buttons_ops.c
source/blender/editors/space_image/image_header.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_view3d/SConscript
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/editors/space_view3d/view3d_select.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_manipulator.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/makesdna/DNA_object_types.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/SConscript
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_nla.c
source/blender/makesrna/intern/rna_object_api.c
source/blender/python/generic/bpy_internal_import.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/shadeoutput.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp
tools/Blender.py