2.5: merge with trunk, previous merge was only up to yesterday.
[blender.git] / source / blender / editors / object / SConscript