Merged changes in the trunk up to revision 27647.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 21 Mar 2010 19:55:51 +0000 (19:55 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 21 Mar 2010 19:55:51 +0000 (19:55 +0000)
commit29adfa7d649df33a3d756b02058b4c1b09740058
tree21e67b74b7e2e1d77a2ee7e78fe41440f66e3054
parent852144225732f0676ccd4cd78606e2a6914d81e4
parentdd4a8bff516bcc7c0dc14325cfff6ede17118e27
Merged changes in the trunk up to revision 27647.
21 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/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/space_view3d/view3d_edit.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_orientations.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/extern/include/RE_pipeline.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeinput.c
source/blender/render/intern/source/shadeoutput.c
source/creator/creator.c