Blender Git Loki

svn merge ^/trunk/blender -r50999:51100

Collada Code Fix

merge with trunk -r50910

merge with trunk r50303

Scons:
* Fix scons compilation, by moving some arguments to the second argument list.

svn merge ^/trunk/blender -r50010:50095

- bf_fbx: cleanup import defaults, fix typos and UI descriptions.

- bf_assimp, bf_fbx: make assimp and fbx import settings accessible from the UI / add them to SRNA.

- bf_fbx: expose more of assimp's fbx import settings to Blender.

Code cleanup

code cleanup

fix for incorrect clamping for rgb_invert() function

svn merge ^/trunk/blender -r49963:50010

fix for build error after merging

svn merge ^/trunk/blender -r49900:49963

svn merge ^/trunk/blender -r49800:49900

svn merge ^/trunk/blender -r49750:49800

Texture Paint Alpha Masks
=========================
* Add rotation for masks
* Fix rotation for projection painting.
* For now mask acts only as stencil for the cursor (ie non projective)
This can change though based on user input

Mask textures for texture paint
=================================
Cleanup options available for mask textures

Fix update of mask overlay