Merged changes in the trunk up to revision 30335.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 14 Jul 2010 19:01:40 +0000 (19:01 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 14 Jul 2010 19:01:40 +0000 (19:01 +0000)
commitf588c49cb55b5787085e2b5a65991efd31ce2dee
treef4ad4fd5b7a9b0c21c0c65fa357e68a3d8f97f31
parent8d131d519bf448bcccddb833c263bc36af22d6b5
parentd4b04fac044b2fe0b6295f271a78c73d57ef0533
Merged changes in the trunk up to revision 30335.
15 files changed:
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/interface/interface_templates.c
source/blender/editors/space_outliner/outliner.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main_api.c
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt