Merged changes in the trunk up to revision 27063.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 21 Feb 2010 21:47:52 +0000 (21:47 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 21 Feb 2010 21:47:52 +0000 (21:47 +0000)
1  2 
release/scripts/ui/space_userpref.py
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_material_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c

Simple merge
Simple merge