Merged changes in the trunk up to revision 27779.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Fri, 26 Mar 2010 20:18:39 +0000 (20:18 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Fri, 26 Mar 2010 20:18:39 +0000 (20:18 +0000)
commit009d7819c144047355c35fb1ac90333351779e3c
tree466be90a1b8e79b37a7578087bad5db81a2bf074
parent048f357f416d8044a3acfb16f7cd27db194cd3e8
parenta5197f4943a2c117a53b50ca12eba193d42663ea
Merged changes in the trunk up to revision 27779.
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_scene_types.h
source/blender/render/intern/source/pipeline.c
source/creator/creator.c