Merged changes in the trunk up to revision 32390.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 9 Oct 2010 22:30:01 +0000 (22:30 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 9 Oct 2010 22:30:01 +0000 (22:30 +0000)
commitd7cd6e349d01f6be60649a013c22330f0ba34c54
treecaa99d6a9c1acc076cdf5c570ef8a67c24bd0880
parent854ef1770075c6e1579ccbbd30eda57484527760
parentd420d09da982e1a874ffe2b0612b8fdd0afc980e
Merged changes in the trunk up to revision 32390.
12 files changed:
release/scripts/ui/space_userpref.py
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/transform/transform.c
source/blender/makesrna/RNA_access.h
source/blender/python/intern/bpy.c
source/creator/CMakeLists.txt
source/creator/creator.c