Blender Git Loki

Merge branch 'master' into cycles_bvh

UI customizations: distinguish between flow type and flow behavior

Enable render strand display during hair edit mode.

Store a copy of the strand roots array in the strand edit data.

This will allow the edit mode to display render strands as well.
The roots may later be re-scattered or otherwise modified during editing,
and are eventually copied back to the Strands data when applying edits.

Cycles BVH: Add some TODOs and some minor cleanup

Merge branch 'master' into soc-2016-multiview

Cycles BVH: Lazily allocate aligned transform in BVH node

This is an attempt to save up memory for oriented nodes during BVH build.

Will likely introduce some slowdown to construct hair BVH, but that we can
optimize later by using specialized allocator.

remove check for correspondence num and clip num

- fix bugs in BKE_tracking_correspondence_add:
also check whether other_clip.other_track has been linked
previously hasn't done that

- remove check for correspondence number and clip number, previously
needs 8 correpondences and 2 clips to trigger multi-view
reconstruction

- format code to conform google style and blender style

Cycles BVH: Bring back extmax to regular BVH aligned node intersection on GPU

Also fix compilation error there.

Cycles BVH: Don't store w component of transform for regular bvh unaligned nodes

Saves quite some memory (467MB vs 528MB with koro.blend file).

Once again addressing review from Brecht.

Cycles BVH: Simplify some evaluation in regular BVH traversal

Addressing review from Brecht.

Cycles BVH: Simplify fetching of regular BVH unaligned transform

Nice trick suggested by Brecht, thanks!

Clear the edit draw data on updates, to make edit mode changes visible.

Cycles BVH: Use proper forward eclaration of Transform

Spotted by Brecht, thanks!

Cycles BVH: Avoid confusion about shadowing class members

Sort UV islands by area for packing (largest->smallest)

Cycles BVH: Fix typo

GPU buffer functions for drawing a strand edit BMesh.

Now the object mode and edit mode for strands use the same drawing code.
Derived render strands are not yet supported (they may need re-scattering
during editing) and the tool settings have no effect yet.

Cycles BVH: Move unaligned threshold to parameters

Suggested by Brecht in review.

Should be no functional changes.

Cycles BVH: Remove debug-only code

That code would have created too much unaligned nodes.

Spotted by Brecht, thanks!