Merge from trunk
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Wed, 14 May 2008 20:01:22 +0000 (20:01 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Wed, 14 May 2008 20:01:22 +0000 (20:01 +0000)
commitc4937891ea5ba542fe15203c287911fb87008875
tree6e247556b66fc8d93503a4c81cfadf996e564f59
parent859a05864cb1c16130175bc304ed1beb1589eb4e
parentd1b04a3a9d67f054d978c407461c3f92161a4cc8
Merge from trunk
svn merge -r 14760:14843 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenkernel/intern/modifier.c
source/blender/src/buttons_editing.c