* Merged changes in the trunk up to revision 31789.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 6 Sep 2010 23:26:36 +0000 (23:26 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 6 Sep 2010 23:26:36 +0000 (23:26 +0000)
commit9c6feb1987f46a8891de6c8155120026d9c7e792
treecd4d4e0355ddb53f5615a4c7d1331bda56f6bca5
parentbc7fcc57f6eef9c1d6d5f52ca92591b45d54fb49
parent99954545ee23dbeb932add263e94e34ed85c91d5
* Merged changes in the trunk up to revision 31789.

* Made a local fix for a compilation error with VC++ 2008 and
CMake, reported to the bf-committers mailing list:
http://lists.blender.org/pipermail/bf-committers/2010-September/028643.html
21 files changed:
release/scripts/ui/space_userpref.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/material.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_outliner/outliner.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_types.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/SConscript
source/blender/python/doc/sphinx_doc_gen.py
source/creator/CMakeLists.txt
source/creator/SConscript
source/creator/creator.c