Merging revisions 14838-14945 of https://svn.blender.org/svnroot/bf-blender/trunk...
authorDaniel Genrich <daniel.genrich@gmx.net>
Fri, 23 May 2008 20:36:05 +0000 (20:36 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Fri, 23 May 2008 20:36:05 +0000 (20:36 +0000)
1  2 
source/blender/blenkernel/intern/modifier.c
source/blender/blenloader/intern/readfile.c
source/blender/include/butspace.h
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c
source/blender/src/drawobject.c

Simple merge
Simple merge
Simple merge
Simple merge