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)
svn merge -r 14843:14954 https://svn.blender.org/svnroot/bf-blender/trunk/blender

1  2 
source/blender/blenkernel/intern/modifier.c
source/blender/src/buttons_editing.c

Simple merge