Merged changes in the trunk up to revision 54992.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 3 Mar 2013 15:07:49 +0000 (15:07 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 3 Mar 2013 15:07:49 +0000 (15:07 +0000)
commit66a2b848972d47a033f617a40f9a9044756d1d32
treebf30f5bc13e9c0b4f52aacead676a2c07cbb331a
parent0c5dfc8a639b04e1767852121b9dee7cd5bb050f
parent4774357b594c5cd5a38b21df131b539a197c101b
Merged changes in the trunk up to revision 54992.

Resolved conflicts:
release/scripts/startup/bl_ui/space_view3d.py
20 files changed:
CMakeLists.txt
SConstruct
intern/cycles/blender/addon/ui.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c
source/blender/render/CMakeLists.txt
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt