Blender Git Loki

Merge remote-tracking branch 'origin/master' into decklink

Initial work to allow custom normals setting in BMesh, with quick bmesh py API call too.

Seems to be working OK from quick tests...

Some notes:
- This is mimicking BKE_mesh_evaluate code. While this is OK for some cases,
we'll likely want some more integrated and fine-grained ways to set/edit those
normals in Edit mode once we create real editing tools for those (most likely based
on some BMesh operators).
This implies some kind of dynamic caching/update of clnors spaces though, which
is not trivial. So kept for later, for now you have to set all custom normals at once.
- Not sure where/how to expose this in py API, for now just added a func in bmesh.utils.

Make branch compile with blenderplayer

Merge branch 'master' into HMD_viewport

Conflicts:
build_files/cmake/macros.cmake
intern/ghost/intern/GHOST_SystemX11.cpp
source/blender/editors/space_view3d/view3d_ops.c

Merge branch 'master' into soc-2016-layer_manager

Conflicts:
source/blender/editors/interface/interface_handlers.c

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

add reconstructN.* files, refine data structures

Added "Topological distance" option to Select Shortest Path operator

Similar to the editmesh operator: "Find the minimum number of steps, ignoring spatial distance"

Fix for "face stepping" behaviour of path calculation

Since parametrizer operates on triangles, diagonal edges of quads have to be tagged and not taken into calculation of shortest path

Merge branch 'openvdb' into cvdb_ray_isect

Conflicts:
intern/cycles/kernel/kernel_textures.h
intern/cycles/kernel/kernel_volume.h
intern/cycles/render/attribute.cpp
intern/cycles/render/scene.h
intern/cycles/render/session.cpp
intern/cycles/render/shader.cpp
intern/cycles/util/util_task.cpp

Merge branch 'master' into openvdb

Conflicts:
intern/cycles/kernel/kernel_compat_cpu.h
intern/cycles/kernel/kernel_globals.h
intern/cycles/kernel/osl/osl_services.cpp
intern/cycles/kernel/svm/svm_types.h
intern/cycles/render/svm.cpp
intern/cycles/util/util_task.cpp

Merge branch 'master' into alembic_basic_io

Fix for missing updates when opening a file.

Disney BSDF is now supporting CUDA

Merge branch 'asset-engine' into asset-experiments

Merge branch 'id-remap' into asset-experiments

Merge branch 'master' into asset-engine

Merge branch 'master' into id-remap

Add option to setup scene's frame range based on that of the imported
archive.

Merge branch 'asset-engine' into asset-experiments