Merging r49711 through r49737 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 9 Aug 2012 17:03:33 +0000 (17:03 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 9 Aug 2012 17:03:33 +0000 (17:03 +0000)
commit2e30bf28c11ae5118d6d9e9578a52965a0b401fe
tree250b33863c3408c318128c9d4aba928fea93fb45
parent3a92c8546c232aa81148377557871f152fab29d6
parent9f30c7147cdb726e503ff37ba585f5e35b090d8c
Merging r49711 through r49737 from trunk into soc-2011-tomato
19 files changed:
CMakeLists.txt
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/image.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/render/render_internal.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_image/image_buttons.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_draw.c
source/blender/editors/space_node/space_node.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_space.c
source/blender/render/intern/source/external_engine.c
source/blender/render/intern/source/pipeline.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt