Merged changes in the trunk up to revision 30781.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 27 Jul 2010 00:08:15 +0000 (00:08 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 27 Jul 2010 00:08:15 +0000 (00:08 +0000)
commitbe2e221608971d6e6618887ce40998c993c68ac8
treed33ceba086fb59689f06308a9ea70bd579cc30a0
parent1813324544c7efeeb2c6ef371579313641c86f20
parent432ec37965837c6ed63faec6df57fd53c04ed220
Merged changes in the trunk up to revision 30781.
19 files changed:
release/scripts/ui/space_userpref.py
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/render/render_shading.c
source/blender/editors/transform/transform_orientations.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeinput.c
source/creator/CMakeLists.txt