Merged changes in the trunk up to revision 33894.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 27 Dec 2010 01:38:23 +0000 (01:38 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 27 Dec 2010 01:38:23 +0000 (01:38 +0000)
commit3ead3c4ff3a438202a9838843ed4000b26de62a7
tree868c64cfcf2a5358a181f2cb88d8a534436ab9bd
parent2d1bc90eedf933820bcff744706fd16a80d1d1cb
parentc4a56fda6d64faa3de7d99b29843c8affb6d5156
Merged changes in the trunk up to revision 33894.

A note for branch users: CMake 2.8 on 64-bit Windows Vista raised
an error in line 948 of soc-2008-mxcurioni/CMakeLists.txt due to
an invalid argument for the blender_include_dirs macro:

  blender_include_dirs(${OPENGL_INCLUDE_DIR})

The command above should be:

  blender_include_dirs("${OPENGL_INCLUDE_DIR}")
29 files changed:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/render/CMakeLists.txt
source/blender/editors/render/render_shading.c
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_nla/nla_channels.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/transform/transform.c
source/blender/freestyle/CMakeLists.txt
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/CMakeLists.txt
source/blender/render/CMakeLists.txt
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt