Merging r49191 through r49211 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 25 Jul 2012 15:07:47 +0000 (15:07 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 25 Jul 2012 15:07:47 +0000 (15:07 +0000)
commit0051d24b239dd720bd8eb01e2a068e51d3aa8d40
tree3e0884ab0fbcba070afcae456abfa2ce5e1af47d
parent62df895415912b646d7773ebd8cbc46f6318ab3d
parentc730125f3edeaab0276ae4c2d4ed2a5c5fbc72eb
Merging r49191 through r49211 from trunk into soc-2011-tomato
release/scripts/startup/bl_ui/space_clip.py
release/scripts/startup/bl_ui/space_image.py
source/blender/editors/include/ED_clip.h
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_image/image_buttons.c
source/blender/editors/space_image/image_draw.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_image/space_image.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_space.c