Blender Git Loki

Fix compilation on MSVC with 64-bit bitmasks in the Pass flag

Apparently MSVC doesn't like the (1UL << x) syntax, so now 1 is explicitly cast to a 64-bit integer before shifting.

Select overlapping UVs operator

Found via Select->Select all by trait->Overlapping UVs menu entry, selects all UV charts which overlap/intersect
Operator has an "Extend" option to extend the current selection.

I also turned rectangle/bounds intersection test into a seperate function which can be reused

complete multiview_reconstruction_finish

Various fixes for GL state and some basic texture lookups in the strand geometry shader.

Fix for integer attribute uploading in gpu code.

OpenGL has a separate function for integer attribute pointers.
If the float attribute version is used, the attribute data will be
interpreted and floats and converted to integer values, which
garbles the content of any true int/uint buffer.

Increase soft limit for control strand number for testing.

Fix for UVs being missing when creating a new DerivedMesh in the cache
modifier.

Fix some hierarchical issues.

This fixes the rare issue found in some Maya and Unity files, where an
object would still be scaled even though it has a parent which was
already scaled.

Merge branch 'master' into soc-2016-multiview

trivial formatting

Cleanup: indent.

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

Conflicts:
intern/cycles/kernel/kernel_path.h
intern/cycles/kernel/kernel_path_branched.h
intern/cycles/kernel/kernel_types.h
intern/cycles/render/buffers.cpp
intern/cycles/render/buffers.h
intern/cycles/render/film.cpp
intern/cycles/render/film.h
intern/cycles/render/integrator.cpp
source/blender/render/intern/source/render_result.c

liquid mesh scaling improvements

Cleanup: Correct comment

Merge branch 'master' into soc-2016-layer_manager

Get layer drag & drop with layer groups to work

Still get some occasional crashes but have to investigate at another time.

Merge branch 'master' into wiggly-widgets

Did some further edits on related changes.

Conflicts:
source/blender/blenkernel/intern/object.c
source/blender/blenlib/intern/math_vector.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/ED_transform.h
source/blender/editors/space_graph/space_graph.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_node/space_node.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_sequencer/space_sequencer.c

Fix OSX compile issue

Fix OSX alembic lookup

sanity check in liquid mesh create function. prevents crashes