Merged changes in the trunk up to revision 28536.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 2 May 2010 23:10:22 +0000 (23:10 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 2 May 2010 23:10:22 +0000 (23:10 +0000)
commita1d0913afe228aa55c47eea2d3ffd617df67fcc0
tree89bcd02737d42d34d39f52b3bf5c4fcdd741a86d
parent51c8ead828d507f4a7708ebf9f02d83e92b4a369
parent139f456bd1583083683ab5d178f24f670576d0eb
Merged changes in the trunk up to revision 28536.
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/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/intern/makesdna.c
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/CMakeLists.txt
source/creator/creator.c