Merging r49212 through r49222 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 25 Jul 2012 19:46:23 +0000 (19:46 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 25 Jul 2012 19:46:23 +0000 (19:46 +0000)
commita14f8443159c3973d8aad8d9c4f4611d20e95f7f
tree5eaf45c4a47f6b2e6fa6d69b4c0dcece6d3d4063
parent0051d24b239dd720bd8eb01e2a068e51d3aa8d40
parent4ca9275b448fa62fa1c0d55007417558c6552d77
Merging r49212 through r49222 from trunk into soc-2011-tomato
source/blender/editors/space_clip/clip_editor.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
source/blenderplayer/bad_level_call_stubs/stubs.c