Blender Git Loki

Fix missing brush texture mask in texture properties, for cycles. Handling this
properly with blender internal is probably for after release, when we can add
the same system to gather textures from brushes, modifiers, force fields, ...