Merging r49534 through r49573 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 5 Aug 2012 12:54:39 +0000 (12:54 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 5 Aug 2012 12:54:39 +0000 (12:54 +0000)
commitcae3dbd14121fd72d301ec3323450801fff45a45
treef6749523d2c67298734e904992018b33c2518379
parente7f8b52aee26c05b4497850b4085cea91eac5e8a
parentaff4c781eb27ea88a0bde0e8e0fef1691488841e
Merging r49534 through r49573 from trunk into soc-2011-tomato
14 files changed:
CMakeLists.txt
build_files/cmake/macros.cmake
release/scripts/startup/bl_ui/space_clip.py
release/scripts/startup/bl_ui/space_image.py
source/blender/blenkernel/intern/mask.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_intern.h
source/blender/editors/space_node/space_node.c
source/blender/makesrna/intern/rna_movieclip.c
source/blender/windowmanager/intern/wm_init_exit.c
source/creator/CMakeLists.txt