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)
commitfe26492538edefe60a342bce109e17b9536e5a16
treedf81d2485abd06be9cd2f4536a661b05153dff94
parent8f969fdc40cded16ec58f6810585411adbb5538d
parentcf9e619889fdcdc457e44d4b384cda091de55673
Merged changes in the trunk up to revision 54171.
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