Cycles: svn merge -r41266:41467 ^/trunk/blender
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 2 Nov 2011 16:17:05 +0000 (16:17 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 2 Nov 2011 16:17:05 +0000 (16:17 +0000)
commit2f453773f6b4cd0a03f5e2d9876ee250b87871f0
tree08c4bb2c1c3ee3fe5131e46a4e39b9224ba5c251
parent02fae3440c8b4b89aa0f9412bc4e0db60a787c13
parente1594ebb3c52f573a8a6c90f3d30acfb3de6e8a5
Cycles: svn merge -r41266:41467 ^/trunk/blender
28 files changed:
CMakeLists.txt
build_files/cmake/macros.cmake
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/world.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_icons.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/gpu/intern/gpu_material.c
source/blender/imbuf/CMakeLists.txt
source/blender/imbuf/intern/readimage.c
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/DNA_world_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_ui_api.c
source/blender/makesrna/intern/rna_world.c
source/blender/nodes/shader/node_shader_tree.c
source/blender/windowmanager/intern/wm_event_system.c
source/creator/CMakeLists.txt
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp