Blender Git Loki

Merge branch 'master' into id-remap

Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/intern/brush.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenloader/BLO_readfile.h
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_action/space_action.c
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_graph/space_graph.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_logic/space_logic.c
source/blender/editors/space_nla/space_nla.c
source/blender/editors/space_node/space_node.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_sequencer/space_sequencer.c
source/blender/editors/space_text/space_text.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/windowmanager/intern/wm_files_link.c
source/blender/windowmanager/wm_files.h

Intersection test for charts

Seems like I need to write my own line intersection check...

Merge branch 'master' into id-remap

Added convex hull to chart data structures

The convex hull is part of the new "PChartIrregularPack" union which will hold useful data during packing

I also re-enabled the line intersection code that was already there, I have to investigate if it is fine to use it or if I need to write my own

Cycles: Avoid unwanted evaluation in non-hair traversal

Move Cycles subdivision options to subsurf modifier

Subdivision options can now be set per object rather than per mesh. The
subsurface modifier must be the last in the stack or Cycles will ignore
the option.

Merge branch 'master' into cycles_bvh

Merge branch 'master' into strand_editmode

Make sure curve knots are computed.

Support creases on subdivision meshes

fix a minor bug when compiling

add support for transformed objects

Minor whitespace fix.

first working version of silhouette brush tool

Merge remote-tracking branch 'origin/master' into gsoc2016-improved_extrusion

Curves: Extend tool/ Trim tool

Extend tool: fixed a few bugs, as described by dphantom in
http://blenderartists.org/forum/showthread.php?397450-GSoC-2016-Improvements-to-Bezier-Curves&p=3066750&viewfull=1#post3066750

Trim tool: Implemented spline_X_shape (helper function)

Moved maps out of strokecache and into sculptsession.

Merge branch 'master' into soc-2016-multiview

Fix build error on older compilers