Merged changes in the trunk up to revision 27420.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 11 Mar 2010 20:04:25 +0000 (20:04 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 11 Mar 2010 20:04:25 +0000 (20:04 +0000)
commit852144225732f0676ccd4cd78606e2a6914d81e4
treef2795f4f5f72f95d8e194d35a6f20e78642caa3c
parent6f4ff64570bcf534c85d8b37da45d20473a0ac6d
parentd896c1f21f2e6b1f98a1a18dae649c065f9aa06d
Merged changes in the trunk up to revision 27420.
17 files changed:
release/scripts/ui/properties_render.py
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/blenloader/intern/writefile.c
source/blender/editors/render/render_intern.h
source/blender/editors/render/render_ops.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/bpy.c
source/blender/render/intern/source/pipeline.c
source/creator/creator.c