Blender Git Loki

Merge branch 'strand_editmode' into alembic

Moved particle related functions of the strands edit mode into a
separate file.

This may seem a bit like overkill, but it helps ensure that no particle
depedencies messes up the strand editing code. The same will be done for
other use cases of the strand editing code in the future.

Merge branch 'strand_editmode' into alembic

Added missing CD layer type name for MSurfaceSample.

Merge branch 'strand_editmode' into alembic

Conflicts:
source/blender/editors/space_view3d/drawstrands.c
source/blender/editors/space_view3d/view3d_intern.h

Forgot this last merge

Merge branch 'master' into gooseberry

Conflicts:
source/blender/editors/space_sequencer/sequencer_draw.c

Merge branch 'master' into alembic

Merge branch 'master' into strand_editmode

Conflicts:
source/blender/bmesh/bmesh_class.h
source/blender/bmesh/intern/bmesh_mesh_conv.h

Enums should not be in CAPS.

Get rid of bogus XXX comments

FileBrowser: enhance handling of most compact drawing by also reducing size of static strings like file size.

Extended shape key evaluation for cached strands blending.

Now shape keys don't replace the cached base data entirely with the
static Basis shape. Instead the current state as coming from the cache
is interpreted as the variable refkey instead of the Basis key.

The Basis key is in fact redundant, but removing it would require
changing a lot of shared shapekey code, so it's left in for now.

Cycles kernel split: Fix compilation error after recent changes

this includes compilation fix for OSL and some tweaks to code to make
strict compiler flags happy,

Make sure we undef KERNEL_TEX once we are done with it

make "const ccl_addr_space" consistent throughout the code

Move definition of ccl_addr_space to kernel_compat_*

Fix size of files not showing in default Filebrowser mode.

Rename __ADDR_SPACE__ to ccl_addr_space

FileBrowser: make (fixed) column size user-configurable (re[ab]using new thumbnail size).