svn merge -r 12716:12856 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Wed, 12 Dec 2007 17:58:06 +0000 (17:58 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Wed, 12 Dec 2007 17:58:06 +0000 (17:58 +0000)
commitcf59579d44a91a4027d40ed532022ffb31164373
tree1504cb3764d7681fb6e92b7d007c7f8d04eb7eb4
parent42637b725267192bfe22731bf975cfb1a50541ee
parentde17fd9ee5431788e7e55daeb8e5ad6fb07894dc
svn merge -r 12716:12856 https://svn.blender.org/svnroot/bf-blender/trunk/blender
14 files changed:
CMakeLists.txt
intern/elbeem/intern/isosurface.cpp
intern/elbeem/intern/solver_main.cpp
source/Makefile
source/blender/blenkernel/BKE_modifier.h
source/blender/blenkernel/intern/modifier.c
source/blender/blenloader/intern/readfile.c
source/blender/include/butspace.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c
source/blender/src/editobject.c
source/blender/src/editparticle.c
source/blender/src/transform_conversions.c