svn merge -r 16320:16369 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Fri, 5 Sep 2008 00:12:01 +0000 (00:12 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Fri, 5 Sep 2008 00:12:01 +0000 (00:12 +0000)
commitd2c13039ede9e50cf2aaf55651f66d4b730089af
tree2a5219dd51dffd273455652dbbd84d868d43361e
parent7afc0ca6009b063e6f2fd4123d8b86da174db379
parentcb89decfdcf5e6b2f26376d416633f4ccf0c532d
svn merge -r 16320:16369 https://svn.blender.org/svnroot/bf-blender/trunk/blender
12 files changed:
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/ipo.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/makesdna/DNA_ipo_types.h
source/blender/src/buttons_object.c
source/blender/src/editipo_lib.c
source/blender/src/editmesh.c