Blender Git Loki

Merge branch 'master' into alembic

Conflicts:
intern/cycles/blender/blender_sync.h

mathutils_bvhtree: Changed type names for bvhtree elements to make them
more consistent with other API parts.

In particular using TESSFACE instead of FACE for clarity.

mathutils_bvhtree: Support various types of DerivedMesh data, based on
requested settings.

mathutils_bvhtree: Removed unnecessary dealloc function for bpy types.

mathutils_bvhtree: Changed return values of find-nearest functions to
plain distance instead of squared distance.

For bpy API a consistent use of plain distance is less confusing and
the overhead is not very relevant.

Merge branch 'master' into mathutils_bvhtree

WIP: fancy wireframe display

Exploring some possibilities with wireframe rendering beyond solid
color.

New effect: color edges based on angle between the faces joined. Loose
edges, perimeter edges, and edges joining 3+ faces are colored
differently.

Some of this code will move to Workflow Shaders. Other parts will move
to DerivedMesh data requests �?? AdjacentFaces (struct) and/or angle made
by adjacent faces (float).

The (incomplete) shader version uses VertexBuffer�??s generic attribute
API, which we want to switch everything to eventually. There is a GLSL
vertex shader *not* included in this commit because I don�??t know where
to put it�?�

The CPU version is temporary �?? it�??s equivalent to the shader setup +
matching GLSL shader.

This particular effect is view independent, so can be done CPU-side
once and drawn many times. Other effects I�??m working on are view
dependent, so really need the setup + shader split.

Merge branch 'master' into ui-preview-buttons

Fix bad import in __del__ context, and fix/enhance ui_previews template to only rescan when dir changes.

Merge branch 'alembic' into gooseberry

Fix for own bug in rB6d1fecc15254381420fdb1290eb611ed14cddaae.

The UV and vertex color attribute export function expects the curve data
arrays to contain only a single attribute at a time. They must be
cleared before filling in data for each UV/vcol attribute.

Fix T44522: loop remapping between meshes when using 'nearest vert, best matching normal' modes
would fail on coplanar faces (or smooth verts).

Loop remapping is really a tricky topic... For now, we enhance a bit more
our Frankenfunc by using distance between dest and source polygons as
fallback in case we have too much similar normals...

Probably not a perfect solution, but should be robust enough I hope.

One core question remains open though: do we want to stick to 'use only seams
to detect UV islands'? This makes things much simpler, but will obviously fail
in case of actual islands without matching seams. :/

Minor cleanup in comments.

Fix T44516 grid lines obscuring selection outline.

Was changed to draw after meshes without depth mask to make grid not
contribute to compositing effects. Now only draw it like this when we do
compositing (unfortunately can't have both).

Project Paint: Add symmetry support

- Access from symmetry panel (as with sculpt)
- Supports multiple axis at once.
- Supports all brush types including clone.

Cleanup: const correctness

BLI_utildefines: add MEMSET_STRUCT_OFS macro

Cleanup: Move Cycles volume stack update for subsurface into kernel_volume.h.

Fix T44530 UV islands fail on subsurf after mirror modifier.

Caused by own commit that changed island detection code. In the case of
modifiers we don't want to take winding information into account, but
left the code since there are use cases (like painting) which could use
this.

Use gnu89 for GCC

GCC5 defaults to gnu11, which we may switch to later
but disable for now to prevent accidental use.