svn merge -r 16369:16454 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Wed, 10 Sep 2008 11:04:07 +0000 (11:04 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Wed, 10 Sep 2008 11:04:07 +0000 (11:04 +0000)
commit190aae27ae7149945f2bf802d7cfd7691f61c45f
tree7f64806cb35162dd12c6ed4f08309ef11771dbb1
parentd2c13039ede9e50cf2aaf55651f66d4b730089af
parent75078d62df5ee8186369b5f1273b61b0736346ec
svn merge -r 16369:16454 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenkernel/intern/modifier.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/render/intern/source/convertblender.c
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c