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

1  2 
source/blender/blenkernel/intern/modifier.c
source/blender/makesdna/DNA_modifier_types.h