svn merge -r 12496:12607 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Fri, 16 Nov 2007 14:41:07 +0000 (14:41 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Fri, 16 Nov 2007 14:41:07 +0000 (14:41 +0000)
commit04e304682439c04ddc9eedb6e8429a1c65250e6d
tree9ff619d1c264633ec9ad32d276adde59a27e8598
parent057060967e07b052c70010b4c6d7d38dd03f6925
parentfd3764f9a4cf197d220f5ec993178f2a4ff29326
svn merge -r 12496:12607 https://svn.blender.org/svnroot/bf-blender/trunk/blender
13 files changed:
source/Makefile
source/blender/blenkernel/intern/modifier.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/include/butspace.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_object_force.h
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c
source/blender/src/editobject.c
source/blender/src/transform_conversions.c
source/blender/src/transform_generics.c
source/blender/src/vpaint.c