Merged changes in the trunk up to revision 52118.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 12 Nov 2012 00:30:55 +0000 (00:30 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 12 Nov 2012 00:30:55 +0000 (00:30 +0000)
commit7fa096261a22afcfb317bcb57ea17aa109f1564d
tree8d51f5be097efbfbcec0155db8a6fa8882387aff
parenta8a2782d34fd09a35598c2653a8225942c4c2ca0
parentfbc1cc712f281e1cf61f40d70f09f8479506e018
Merged changes in the trunk up to revision 52118.

Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c
30 files changed:
build_files/scons/tools/Blender.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/intern/bmesh_construct.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/space_buttons/buttons_context.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.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/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt