Merging r49400 through r49404 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 30 Jul 2012 17:12:55 +0000 (17:12 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 30 Jul 2012 17:12:55 +0000 (17:12 +0000)
commita080183e42f81f57776c182b4c55df28eeed98bd
tree17f53220227b550711a6df9a82f8633c32d8cbad
parentccf2f85b3e031da2c54693a6dd16cc9b18b76f1c
parent9880f7fa507e57fa19191a8d5a03c6b6b11623d5
Merging r49400 through r49404 from trunk into soc-2011-tomato
release/scripts/startup/bl_ui/space_node.py
source/blender/editors/space_image/image_ops.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_space.c