Merging r46725 through r46963 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 24 May 2012 09:47:29 +0000 (09:47 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 24 May 2012 09:47:29 +0000 (09:47 +0000)
commit14a56caee6c63822cb3af4471ed89e3ebefebc55
tree4c1cf223f60370894006fc0e6fdc4f3f4f09e90c
parente76812a1d7490b01066c0f751d5311b58825ffd8
parent5f677f995d204c378f7aad3de826b2e193276487
Merging r46725 through r46963 from trunk into soc-2011-tomato
36 files changed:
source/blender/CMakeLists.txt
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/context.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/movieclip.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/tracking.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/include/ED_transform.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_clip/clip_draw.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/space_node.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_ops.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_nodetree_types.h
source/blender/makesrna/intern/rna_space.c
source/blender/nodes/CMakeLists.txt
source/blender/nodes/NOD_composite.h
source/blender/nodes/composite/node_composite_tree.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt