Merged changes in the trunk up to revision 27178.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 28 Feb 2010 03:44:15 +0000 (03:44 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 28 Feb 2010 03:44:15 +0000 (03:44 +0000)
13 files changed:
1  2 
release/scripts/ui/properties_render.py
release/scripts/ui/space_userpref.py
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/render/SConscript
source/blender/editors/space_outliner/outliner.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_orientations.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c
source/creator/creator.c

Simple merge
Simple merge
Simple merge