svn merge -r38600:38700 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 26 Jul 2011 04:31:59 +0000 (04:31 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 26 Jul 2011 04:31:59 +0000 (04:31 +0000)
12 files changed:
1  2 
release/scripts/startup/bl_ui/space_info.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/effect.c
source/blender/editors/object/object_edit.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/mathutils/mathutils.h
source/blender/python/mathutils/mathutils_Quaternion.c
source/blender/python/mathutils/mathutils_Vector.c
source/blender/render/intern/source/convertblender.c