svn merge -r36583:36603 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Wed, 11 May 2011 00:19:13 +0000 (00:19 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 11 May 2011 00:19:13 +0000 (00:19 +0000)
commit0f329ebdf19ab7773565b705614c867b01aeadfe
tree0f85ded4a0d7c2bdf7f87fc3aaf59e74acfc326b
parentbcdd9d236cfca0e3f68fc80ad5d8967d18350285
parentfab1ee1f78cd0cba92053e6b569f0cb6126ca2ca
svn merge -r36583:36603 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/object.c
source/blender/editors/curve/editcurve.c
source/blender/editors/object/object_transform.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/gpu/intern/gpu_draw.c
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/source/strand.c