Merge from trunk
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Sun, 25 May 2008 13:53:58 +0000 (13:53 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Sun, 25 May 2008 13:53:58 +0000 (13:53 +0000)
commitcc98ef4012d77c384cfd22c2567f4a03b4187696
tree60f98f521df16347cab9dfc4e807bcfcdb20b932
parentfd53876faf4dbf50946729deef20c5e6264b5d20
parente2a9590a15c807c391ec7eff05c7168a8025ab7a
Merge from trunk
svn merge -r 14843:14954 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenkernel/intern/modifier.c
source/blender/src/buttons_editing.c