Merge from trunk
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Fri, 9 May 2008 11:57:52 +0000 (11:57 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Fri, 9 May 2008 11:57:52 +0000 (11:57 +0000)
commit53e08925b55b70b5f1093199e4e98cec121feadd
tree2a408f9c05918f78778f8d80470e0774ed5d8498
parent50acbe29d1c486b3f7fe1fb31b7be0963e7f7748
parent8d6857b915d25c9a4d8e932dc6896abbe8180686
Merge from trunk
svn merge -r 14692:14760 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/shrinkwrap.c
source/blender/src/buttons_editing.c