Blender Git Loki

Merge branch 'master' into gooseberry

Merge branch 'master' into gooseberry

Merge branch 'master' into gooseberry

Conflicts:
source/blender/makesdna/DNA_customdata_types.h

Experimental: random colors for child hulls.

Fix for invalid cache index -1 in some cases, like virtual parents.

The code was assuming that child 0 is always valid, but in fact has to
be treated like all others that can be disable due to preview percentage,
virtual parents, etc.

Use the particle system material for OpenGL drawing.

This is probably not correct yet, the code is terribly confusing ...

Implemented caps for the convex hair bundle hulls.

The current algorithm generates a triangle strip to fill the end of
each child bundle. This is not quite ideal, because even though the
base child groups are constructed to be convex, the resulting child
paths can become concave again by clumping, roughness, hair dynamics
etc.. This can create face inversion as well as ugly shading artifacts,
so a nicer algorithm may be desirable.

Only perform the inner loop over one group of connected paths in macros.

This allows more customized handling of path drawing in the outer loop
(needed for drawing end caps).

Nicer iterating over pairs of connected neighboring child paths.

Removed parent path drawing code for hulls, this is never used anyway.

Completed the convex hull calculation for child paths.

Parent index is only stored for hull children as a means of identifying
them in the drawing code.

Disabled fallback path drawing for now, is currently nested inside the
OpenGL immediate mode calls.

Ignore paths with segments == -1, this is used to indicated hidden
children.

Use line drawing as a fallback if only one child is assigned to a parent.

Fix for recent particle drawing commit, need to update the local draw
data variable after changing the buffer.

Don't draw 2-sided flat hulls, this just gives ugly Z fighting.

Sorting of child particles by primary parent and offset in hair space.

This is a prerequisite for constructing the convex hull of child paths
around a parent.

Simple immediate-mode OpenGL drawing for convex child hair hulls.

More code cleanup to avoid crazy huge and messy particle functions.

Calculate normals and use smooth shading in the strand direction for
child hulls.

Note that the perpendicular direction around the hair bundles is not
smooth-shaded. Smooth shading doesn't make as much sense there because
large angles are common in this direction and give awkward shading
results.