Merged changes in the trunk up to revision 51985.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 7 Nov 2012 22:12:19 +0000 (22:12 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 7 Nov 2012 22:12:19 +0000 (22:12 +0000)
commita8a2782d34fd09a35598c2653a8225942c4c2ca0
tree4715ccd75214e81662e2cfa684aaad610c8d25e5
parentdd633f1affc8951a0a6ba19cdffbb58ac7f54acd
parentb51908b913f318986a91c766980ed01010c5249a
Merged changes in the trunk up to revision 51985.
23 files changed:
release/scripts/startup/bl_ui/properties_render.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/scene.c
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_file/filelist.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_color.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/python/intern/bpy.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
source/blender/windowmanager/intern/wm_files.c
source/blenderplayer/bad_level_call_stubs/stubs.c