Blender Git Commits

Merge branch 'master' into wiggly-widgets

Merge branch 'master' into wiggly-widgets

Merge branch 'master' into wiggly-widgets

Revert "Cycles-Bake: custom (with latest master baking fixes)"

This reverts commit d34d8a2eb69841832e072c14d1a8a893156ac0cd.

Cycles-Bake: custom (with latest master baking fixes)

Merge remote-tracking branch 'origin/master' into experimental-build

Cleanup: Use node/socket pair keys more consistently instead of pointers.

Libmv: Solve some strict compiler warnings

This commit is to be backported to upstream still

Move Libmv from extern/ to intern/

Logically it is intern library since being mainly developed by 1.5 blender guys.

Move Ceres to extern/

Even tho it's currently only used by Libmv we might use it for something
else in the future. Plus, it's actually where it logically belongs to.

Move GLog/GFlags to extern/

This is where the libraries belongs to actually, they are not only used by
Libmv now, but also by tests and Cycles.

Strict separation of input and output socket keys for clarity.

This avoids confusion regarding what socket keys are stored in maps etc.

Re-organize structure of GLog/GFlags CMake libraries

The idea is to split them into two separate targets and have dedicated include
directories list for each of them in order to avoid some annoying include header
modifications in comparison with upstream.

Reviewers: campbellbarton, juicyfruit

Differential Revision: https://developer.blender.org/D1706

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

Merge branch 'master' into object_nodes

Merge branch 'master' into openvdb

Added basic semantics to the debug compiler by accessing node types.