Merge from trunk
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Tue, 3 Jun 2008 19:27:46 +0000 (19:27 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Tue, 3 Jun 2008 19:27:46 +0000 (19:27 +0000)
commit7265e9e855e372061d50233e76d89f7113e2c636
tree77f3b9b550c8dc6c6444afead01d2324de5b8846
parentdb650f1be9d73b9c4d2e200a91a87fd5b2bb24d8
parent0c0c43f62001eb652b8a8c374cca390824ef2c5e
Merge from trunk
svn merge -r 15064:15104 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenkernel/intern/modifier.c
source/blender/makesdna/DNA_modifier_types.h