Merge from trunk
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Fri, 30 May 2008 20:33:33 +0000 (20:33 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Fri, 30 May 2008 20:33:33 +0000 (20:33 +0000)
commit318606addfed1a7d92e36597c3845bab6cade5cb
tree5736f69546ab3b30567c8ae9be3e4c436f779c64
parent07e80dc2658fcdb54a40701164665123d14f8f44
parent5c1acc5ced3ef9a312c9120a75d6021eb9464907
Merge from trunk
svn merge  -r 14954:15064 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenkernel/intern/modifier.c
source/blender/src/buttons_editing.c