Merging from trunk up to r38119.
authorJoerg Mueller <nexyon@gmail.com>
Tue, 5 Jul 2011 13:54:25 +0000 (13:54 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Tue, 5 Jul 2011 13:54:25 +0000 (13:54 +0000)
commit3f3c6f5f1fb336f8f0015d7857a1ae153fa2a80f
tree27e2ae66dd589013c24592fe0803b440a7e014be
parent887fd19894047832fbb7a7300e5fc11438b1f3b2
parentccd31900ab9659b6fdc035fd91bff9f508334e22
Merging from trunk up to r38119.
24 files changed:
release/scripts/startup/bl_ui/properties_render.py
release/scripts/startup/bl_ui/space_userpref.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/sound.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/collada/CameraExporter.cpp
source/blender/collada/DocumentExporter.cpp
source/blender/collada/LightExporter.cpp
source/blender/editors/animation/anim_markers.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_style.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_armature.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/intern/wm_files.c