svn merge -r 15800:15973 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Tue, 5 Aug 2008 16:12:40 +0000 (16:12 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Tue, 5 Aug 2008 16:12:40 +0000 (16:12 +0000)
commit1d87a596e45d57d89d02ea114f991c3e60d038ce
treece524301430185b2c21d11cff460c43fb0cc14e2
parent5ba56ffe47825968dba374eb093d29f6d3bff85d
parentb277de28958e8113e2b0ec2f595546fa54b81f3b
svn merge -r 15800:15973 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/render/intern/source/convertblender.c
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c
source/blender/src/editipo.c
source/blender/src/header_ipo.c