Merged changes in the trunk up to revision 54171.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 29 Jan 2013 03:42:19 +0000 (03:42 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 29 Jan 2013 03:42:19 +0000 (03:42 +0000)
1  2 
SConstruct
intern/cycles/blender/addon/ui.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/subsurf_ccg.c
source/blender/editors/interface/interface_templates.c
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/source/pipeline.c

diff --cc SConstruct
Simple merge
Simple merge