Blender Git Loki

Snappy stuff

* Align rotation with snapping target: rotate the object, aligning it with the target (object mode only - temporarily)

* Snap to different mesh elements (face, edge, vertice): snapping target slide on faces and edge or use exact position of vertice. When using Align rotation with edge snapping, the normal is interpolated as you slide along.

Removing ugly apricot hack for drop to ground (YAY!)

Arith:
- axis angle to quat conversion function
- short to float / float to short normals conversion function (eventually, we could go over the go and replace copy/pasted code everywhere)
- ray triangle intersection (to complement the line triangle intersection function)

View:
- viewray / viewline (get near plane point under mouse and ray normal/far point)


Particles:
- extract viewline from brush_add function

added option to apply a spacialy divided grid of images and UV's per mesh. useful for baking terrain in apricot

Apricot Branch: svn merge -r 14866:HEAD

added library loading where you can select many libraries or a directory of libs and load them without appending or linking anything.
This is so the outliner can be used to link in data from existing libraries without having to open each blend file.

Centralize handling of individual center for rotations

Apricot Branch: svn merge -r 14842:HEAD

Merging libmp3lamp from trunk (slipped between the cracks)

first layer icon displayed lighter

added a menu for selecting which types to draw for outliner library members

basic support for browsing libraries from the outliner, clicking on a group links it in and applies it to the active object as a dupli or adds the object if none are
active.
also made dupligroup drawing use the most basic drawtype from teh dupli of the object that instances it. this is so apricot can have low poly objects as lods but not
have overlaping rendering.

Apricot Branch
==============

svn merge -r 14780:HEAD

make smooth work with mirror option

fix for error when resolving conflicts

merge 14760:HEAD

merge from trunk

svn merge -r14718:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender/

apricot request layer colors for active/used/empty color channels, colors are not that nice at the moment, so lucky we have artists!

svn merge -r 14688:HEAD

Apricot Branch
==============

svn merge -r 14688:14706

Also, use vertex arrays for drawing points, and a temporary hack to
reduce the number of points.