svn merge -r 13240:13323 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Mon, 21 Jan 2008 02:42:42 +0000 (02:42 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Mon, 21 Jan 2008 02:42:42 +0000 (02:42 +0000)
commitddef077b38f07a1a6c6c11c8f8cc88149fde421f
tree43790f953963535bb07fd06117711b7b2b1c790b
parent530039a4297d93998202391caedfbbbc2558499d
parentebb15ff9d57402227d19a0c22ea18fb9eeaf6f5e
svn merge -r 13240:13323 https://svn.blender.org/svnroot/bf-blender/trunk/blender
18 files changed:
CMakeLists.txt
extern/SConscript
source/Makefile
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/include/butspace.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c
source/blender/src/drawobject.c
source/blender/src/editobject.c
source/blender/src/editparticle.c
source/blender/src/toolbox.c
source/blender/src/transform_conversions.c
source/blender/src/usiblender.c
tools/btools.py