Merged changes in the trunk up to revision 34574.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 30 Jan 2011 23:41:58 +0000 (23:41 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 30 Jan 2011 23:41:58 +0000 (23:41 +0000)
commit4e9a519e223a467a069d37eedef6f44081ba525a
tree2e0c2b95c3139be332ce8cc1e02969393879a288
parent50ced6b0176db8cf4d2393005be7f371ab9716de
parentd5c7231339c5a5a9714549e0e919fbbd331f09d0
Merged changes in the trunk up to revision 34574.
16 files changed:
release/scripts/ui/properties_render.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_outliner/outliner.c
source/blender/freestyle/CMakeLists.txt
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/CMakeLists.txt
source/creator/CMakeLists.txt
source/creator/creator.c