Merging r48928 through r48937 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 15 Jul 2012 10:51:36 +0000 (10:51 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 15 Jul 2012 10:51:36 +0000 (10:51 +0000)
commit0c087e5154f9d0c381966c27b1c7e7cd6180c4ba
tree7439d2c0a2b5b7c7c0df89b1327333b651839f40
parent50a6cf10b789bc3ead849272bac104e74c0ce534
parent10253f73bcdfc9aee865e06e9000505e08e009dd
Merging r48928 through r48937 from trunk into soc-2011-tomato
release/scripts/startup/bl_ui/space_clip.py
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_image/image_buttons.c
source/blender/editors/space_image/image_draw.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesdna/DNA_mask_types.h