Blender Git Loki

svn merge ^/trunk/blender -r46380:HEAD

svn merge ^/trunk/blender -r46380:46390

svn merge ^/trunk/blender -r46370:46380
1 Tree conflict
I deleted the source/tools/GL and then ran:
svn -r46380 co https://svn.blender.org/svnroot/bf-blender/trunk/blender/source/tools/GL
svn resolve --accept working -R source/tools/GL

svn merge ^/trunk/blender -r46360:46370

svn merge ^/trunk/blender -r46340:46350

svn merge ^/trunk/blender -r46340:46350

svn merge ^/trunk/blender -r46335:46340

1 tree conflict. Resolved:
I deleted source/tools/GL.
Then I checked out folder from trunk (revision 46340)
Then I ran: resolve --accept working source/tools/GL

svn merge ^/trunk/blender -r46330:46335

adding kernel_projection.h in CMakelists

Cycles: add light falloff node, with quadratic/linear/constant falloff and a
smoothing factor to reduce high values near the light.
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/More#Light_Falloff

Note that this was already possible to do manually with the Ray Length, but
this adds a convenient node for it. This commit also makes the mapping node
min/max option work, fixing #31348.

Collada: patch #31331: added missing call to BKE_mesh_tessface_ensure() when 'apply Modifiers' was NOT selected

style cleanup: avi

fix [#31354] Segfault with "Extrude Individual Faces and Move"

Collada: patch #31331: Implementation of 'Apply Modifiers'

fix [#31347] solidify modifier > even thickness parameter weired

style cleanup: outliner

cycles-fisheye: fixed formula for dir to equisolid
second time I need a scond commit to get the equisolid formula right, shame on me ;)
the formula is:
r = 2 x focallength x sin (theta / 2)

Fix for X and Y aspect ratios not working properly with Freestyle stroke rendering.
Problem report by octane98 in the BA Freestyle thread. Thanks!

direction to equisolid - final fix for [#31307] Cycles panoramic fisheye lens and vector pass problem

Some misc fixes to UI messages...