Blender Git Loki

UI: use boxes to separate cache file and modifier/constraint properties.

Some people were confused by the scope of the properties.

OpenJPEG: Fix compilation error on Debian with both 1.5 and 2.1 versions installed

Image IO: update OpenJPEG2.1 from 1.5

Stream handling has changed so this required changes to how files & memory are accessed.

Use ID_IS_LINKED_DATABLOCK macro.

Also avoid using G.main if bmain is already passed to the function.

Merge branch 'master' into alembic_basic_io

Common control curve interpolation utility function.

Avoid accumulating same object paths when opening a file from sequence.

Add a reload operator for updating the object paths list.

Change min value of the Scale prop in the import operator.

Store buffer textures for the rotating frame on control curves.

This frame will allow better deformation effects for bent curves.

Improve object path tooltip.

Prevent misusage of object path property, display an error in the
modifier UI if necessary.

Merge branch 'master' into soc-2016-multiview

Store the paths of the objects in the archive in a collection.

This is mainly for use in a drop down menu in the UI.

add TH_LINKED_MARKER and TH_SEL_LINKED_MARKER

Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/windowmanager/intern/wm_init_exit.c

Use DynString to "include" shared code in the strand vert/geom/frag shaders.

This way we can avoid duplicate code for effects without going out of sync.

CacheFile scale: add a tooltip, set more reasonable min/max values.

Compute normals if none are present in the file.

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

Conflicts:
intern/cycles/kernel/kernel_types.h