Merged changes in the trunk up to revision 26260.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 25 Jan 2010 21:06:08 +0000 (21:06 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 25 Jan 2010 21:06:08 +0000 (21:06 +0000)
1  2 
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/CMakeLists.txt
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/bpy_interface.c

Simple merge
Simple merge