Blender Git Loki

Small optimization to last commit (thx nexyon for the hint)

Merge branch 'master' into asset-engine

Chart placement: Slide possible placement positions along edge of chosen NFP point to include every possible placement solution

Merge branch 'master' into object_nodes

Merge branch 'master' into strand_nodes

Merge branch 'master' into strand_editmode

Curves: Trim operator

Fixed a few memory issues.

Merge branch 'master' into asset-engine

Conflicts:
source/blender/windowmanager/intern/wm_files_link.c

Some more small fixes regarding ID/library asset handling.

Merge branch 'object_nodes' into strand_nodes

Added a number of addition matrix manipulation nodes.

final touches for fluid source settings panel

reorganized flow source settings in UI

Removed the "effects" settings for statically defined fiber displacement effects.

These things will now be possible using nodes.

Fix shader updating, needs a tag reset after invalidating the shader.

Fix debug geometry shader for strands.

This geometry shader must be used regardless of the "use geometry shader" setting
for the primary shader.

Fallback displacement function for the strands shader if no nodetree is available.

Merge commit '3e05be953f619b78c8721631549f9babb0950f4c' into soc-2016-cycles_denoising

Merge remote-tracking branch 'origin/master' into soc-2016-cycles_denoising

Conflicts:
intern/cycles/kernel/kernel_types.h

Cycles: Also prefilter and use the shadow feature pass with CUDA