Merging r46137 through r46202 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 2 May 2012 18:07:01 +0000 (18:07 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 2 May 2012 18:07:01 +0000 (18:07 +0000)
13 files changed:
1  2 
release/scripts/startup/bl_ui/space_clip.py
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/context.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/ED_clip.h
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_conversions.c
source/blender/editors/transform/transform_ops.c
source/blender/makesrna/intern/rna_nodetree.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt

Simple merge
Simple merge