Blender Git Loki

possible fix for running manta python calls under windows

Got the mirror button working. Got multipaint working again.

Fix own mistake: adding boost inc done wrong way

add correspondence mode

Alternative/more robust way to offset/place NFP

This fixes some of my testfiles

Removed a couple of unused fiber curve attribute buffers.

Add more layer visibility checks

Also had to add Object.layer which is synced with Base.layer, a bit hacky though. Could clean this up, but ideally we'd get rid of Base struct completely (think this is doable).

More detailed invalidation function for strand draw data.

Currently only used in its broadest form for freeing the whole buffer,
but could be used in the future to selectively invalidate parts of the
data, to avoid costly uploading of large but static buffers.

Cleanup: use has_animations.

Avoid reading custom datas twice.

Normals from the Alembic archive are not read anymore.

Now we generate the normals on the Blender side and set polygon smooth
flag if needed.

Merge branch 'master' into alembic_basic_io

Cleanup: Move code for strand drawing buffers into its own file.

The gpu_buffers.c file is becoming too large, and incorporates all the logic
from meshes and now strands, which should be separate from the API.

Making the strands buffer code separate also allows much more control,
e.g. for partially invalidating draw data and avoiding unnecessary buffer
uploads to the GPU.

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

Refactoring of NFP code

This fixes some bugs, memory leaks and crashes

Note: Added IFP corners as possible placement positions for now, mainly for testing purposes

Merge branch 'master' into wiggly-widgets

Conflicts:
intern/cycles/blender/addon/ui.py
source/blender/editors/transform/transform_manipulator.c

Merge branch 'strand_editmode' into strand_gpu

Merge branch 'mesh_samples' into strand_editmode

Merge branch 'master' into strand_editmode

Merge branch 'master' into mesh_samples