Cycles: svn merge -r41613:41627 ^/trunk/blender
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 7 Nov 2011 17:13:32 +0000 (17:13 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 7 Nov 2011 17:13:32 +0000 (17:13 +0000)
commitdca15b215d994c7bafe9398493a9db1b4df00246
tree545d3e588adac563250356f17bf3989b5e2bd840
parent5ef9039b7e2ea16bd4b651aab21d5aa690485569
parent69ad40f9ea81ddf5cd0d83dc21cc7f66a8008765
Cycles: svn merge -r41613:41627 ^/trunk/blender
13 files changed:
CMakeLists.txt
build_files/cmake/config/blender_lite.cmake
intern/cycles/blender/addon/engine.py
intern/cycles/blender/blender_python.cpp
source/blender/blenloader/intern/readfile.c
source/blender/editors/screen/area.c
source/blender/editors/space_node/drawnode.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_render.c
source/blender/makesrna/intern/rna_ui_api.c
source/blender/nodes/shader/nodes/node_shader_mapping.c
source/blender/python/intern/bpy_interface.c
source/creator/CMakeLists.txt