Merging r49499 through r49518 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 3 Aug 2012 09:08:40 +0000 (09:08 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 3 Aug 2012 09:08:40 +0000 (09:08 +0000)
commitf736f183a5b94ba80aaeb4cfef7ff1fb9d5f7850
tree800f6887c472b3de42b9489dcbfa0299966eee6e
parent3c2fffd1a913e061d9f16810a191276da1474495
parentdb8c9c24f669d01ba76b9d29d80911d5c96a27a6
Merging r49499 through r49518 from trunk into soc-2011-tomato
14 files changed:
CMakeLists.txt
build_files/scons/tools/btools.py
intern/CMakeLists.txt
intern/SConscript
source/blender/blenkernel/intern/image.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_draw.c
source/blender/editors/space_node/node_intern.h
source/blender/editors/space_node/space_node.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/source/pipeline.c
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt