svn merge ^/trunk/blender -r42139:42172
authorCampbell Barton <ideasman42@gmail.com>
Sat, 26 Nov 2011 16:29:14 +0000 (16:29 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 26 Nov 2011 16:29:14 +0000 (16:29 +0000)
commit3b5bcab09c28163f16d653a5b76dd3192c911007
tree8127e7a5ce98641f27d0edd035922f3ddc9de1a3
parentf1996b5601e41602157035b1d91e8386761bd839
parentd52a811052c67686845dd1737d42fe65add51d55
svn merge ^/trunk/blender -r42139:42172
20 files changed:
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenlib/intern/path_util.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/util/ed_util.c
source/blender/editors/uvedit/uvedit_draw.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_fluidsim_util.c
source/blender/render/intern/source/render_texture.c
source/blender/windowmanager/intern/wm_gesture.c
source/creator/creator.c