Sculpt Branch:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 9 Dec 2009 15:24:55 +0000 (15:24 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 9 Dec 2009 15:24:55 +0000 (15:24 +0000)
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r25180:25245

16 files changed:
1  2 
release/scripts/ui/space_view3d.py
source/blender/blenkernel/BKE_modifier.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/gpu/intern/gpu_buffers.c
source/blender/makesrna/intern/rna_brush.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_sculpt_paint.c
source/blender/windowmanager/intern/wm_files.c

Simple merge