Blender Git Loki

Merge branch 'master' into soc-2016-pbvh-painting

Updated map to be more efficient. Fixed bug with brush radius. Next, looking into getting the nearest ray trace location.

Merge branch 'master' into soc-2016-multiview

get corresondences into libmv

Merge branch 'master' into object_nodes

Use a Scope concept for avoiding codegen for existing nodes.

Rather than a single socket value map, use a "scope" to keep track of which
nodes are already generated. This reintroduces the "block" idea from earlier
versions, but at the later codegen stage rather than the node graph.

Describing scope on the level of nodes becomes quite clumsy and ambiguous,
and moves nodes further away from the UI representation. The compiler can
handle this more elegantly without requiring persistent data.

Scopes can be nested. This is not used yet, but will allow scoped variables
later on, where the variables being used for a node path depend on its scope.

Fix texelFetch for older opengl version.

Fix Crash.

Layer drag & drop reordering

Took some time to get logic to work like user's would expect it, but seems to work now.

hooked up pointcache so that it triggers the new mesh read function

Fix crash accessing invalid property headers.

Cycles: Prepare some utility funcitons for regular BVH traversal

The idea is to use utility function for node intersection, just like
it's done in QBVH. Would make it easier to choose between aligned and
unaligned node intersection here.

Merge branch 'master' into alembic_basic_io

Cycles: Fix naming and merge node intersections into a single file

Split customdata writing in separate files, de-duplicate some code.

Cycles: Some fixes to avoid crashes with regular BVH

Still only will only on scenes without hair.

added mesh (.bobj.gz files) read functionality to fluid class

Remove outdated/bogus customdata writing code.

Add support to read and write vertex colors.

Fix for recent commits: Fix an error, silence warnings, clean up unused code