Blender Git Commits

Merge branch 'master' into alembic_basic_io

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

Packing: No Fit Polygon computation

Still contains lots of debug prints and unoptimized code, but functionality is there

some cleanup for liquid inflow

mesh scaling according to scale factor. not perfect solution though

Merge branch 'master' into asset-engine

Use an additional texture buffer for storing curve indices.

The geometry shader will need to do 2 texture lookups per control,
first for getting the control curve start and length, then for
reading the appropriate curve vertices.

Use the correct buffer for the control points texture.

Also a bit of cleanup renaming to use "control" consistently instead
of "guide".

Modified the guide strand creation operator to allow shorter-than-max strands.

The guide strand format may change, but it should allow varying numbers of control
points.

Calculate barycentric interpolation weights using a simple kdTree method.

This method uses the 3 closest points on the scalp for defining interpolation
weights. This method has drawbacks in cases of thin geometry, but it is
simple to implement.

Vertex attributes for the strand root points.

These attributes carry information for interpolating guide strands
in the geometry shader. Each strand can have up to 4 guide strands
(identified by index) with a normalized weight for each.

merged master, but something in the merge broke my windows build, so I had to change something. Also fixed a bug in mirrored painting.

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

Added mirror painting and radial symmetry.

Merge branch 'master' into soc-2016-cycles_images

Overwrite branch specific changes, make it match vanilla master again. Have to re-think some of that half stuff there.

Fixed undo bug.

Cleanup: Alembic and HDF5 CMake modules.

- Remove references to Samplerate
- Copyright year
- hdf5_hl requirement removed in Alembic 1.6.0

Patch by @ejnersan.

Remove extra statement from some test.

add robustness to correspondence adding:
- when the correspondence has been added, give an error message and
return
- when a conflict correspondence is added, give an error message

Merge branch 'master' into alembic_basic_io