Merged changes in the trunk up to revision 48695.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Fri, 6 Jul 2012 23:46:48 +0000 (23:46 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Fri, 6 Jul 2012 23:46:48 +0000 (23:46 +0000)
17 files changed:
1  2 
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/intern/source/render_result.c
source/blender/render/intern/source/shadeoutput.c
source/creator/CMakeLists.txt

Simple merge
Simple merge