Merging r46203 through r46413 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 8 May 2012 13:01:16 +0000 (13:01 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 8 May 2012 13:01:16 +0000 (13:01 +0000)
commit16d93f3881cc75336e6566933016df7f3a79e753
tree16a5a2ef855bef70c0e8afa6aff94c08ad533d80
parent398884d1866fc3d9aa95892c534498a27cef9491
parent7a4ad3aaaeee044c0768ce1206230a0dd723bb9e
Merging r46203 through r46413 from trunk into soc-2011-tomato
34 files changed:
intern/SConscript
intern/cycles/bvh/bvh_binning.cpp
release/scripts/startup/bl_ui/space_clip.py
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/context.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/mask.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/ED_clip.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/mask/mask_editor.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_clip/clip_dopesheet_ops.c
source/blender/editors/space_clip/clip_editor.c
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_nodetree_types.h
source/blender/makesrna/intern/rna_space.c
source/blender/nodes/CMakeLists.txt
source/blender/nodes/composite/node_composite_tree.c
source/blenderplayer/bad_level_call_stubs/stubs.c