Blender Git Loki

Revert "Disable cuda binaries on the buildbot for the gooseberry branch."

This reverts commit 83da7b1edba27aaeef0a6d4e3114390305f7dc02.

Disable cuda binaries on the buildbot for the gooseberry branch.

Doing this increases build times too much for fast updates.

Fix wrong time sampling in customdata array properties.

The time sampling should be specified explicitly when creating
properties.

Merge branch 'master' into gooseberry

Conflicts:
source/blender/gpu/intern/gpu_buffers.c

Explicit CD type masks for each element.

Avoid storing redundant normals for vertices.

Fix for crash when deleting an object that was used in a dupli cache.

Object-unlink was clearing the linked object's dupli cache instead of
the duplicator.

Make sure normals are correct before writing mesh data to caches.

Normal data layers might not be updated during cache baking
automatically.

New data structure for restoring strand data originating from particles.

The rationale here is that we don't try to replace particle data
temporarily like we do with DerivedMesh. This would be needed for
drawing cached data overrides in the viewport and pass them to renderers
(unless these read Alembic directly) and later for performing dupli
simulation.

Renamed the cache_dm to simply dm.

The fact that this is used for caching is only apparent on the higher
levels of the Object struct.

Write basic hair curves to caches for dupli groups.

This data will be used for dupli simulations later on. Child path
generation could also be done based on this data without involvement of
particle systems.

More compact sample writing code for particle pathcache caching.

Make the nested DM writer in Object writers a pointer, instead of using
the do_mesh flag.

This will be more in line with how optional particle system writer will
be created.

Revert "Avoid conflicting unordered_map definition in cycles"

This seems to break windows builds and should not be necessary.

This reverts commit 12384d564f59646145fa609dfe7e5a61632cd20f.

Fix for use of non-portable function snprintf.

Fix for use of unknown uint type instead of unsigned int.

Use a stub factory when Alembic is disabled to avoid invalid pointer
access.

Fix for linking order in scons preventing correct initialization of
the Alembic caching implementation.

Added Alembic dependency config to the linux x86_64 player buildbot file.

Fix for bf_pointcache lib missing in the blenderplayer and fix for link
order.

Missing include path for scons build files of the gameengine player.