Blender Git Loki

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.

First working implementation of VideoDeckLink.

Doc: TBD
BL_Shader: allows to pass partially defined shader (e.g fragment without
vertex)

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.

Fix compilation with scons

Point addons to v2.74-rc3

We're now RC3

Versioning code to correct socket naming after
340b76b42c53816ddac1b4cecdff3d8d2010a9cc

Reported by formerly Old_Demon on blenderartists.

Apparently this caused old files to lose their links to material sockets
(noob own mistake from inexperience with node system).

This should either be included in release with version checking being
set to version 2.73 and subversion 10, without tweaking the
BKE_blender.h file

OR

340b76b42c53816ddac1b4cecdff3d8d2010a9cc should be reverted for this
release.

Thanks to Lukas for checking this out.

Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/versioning_270.c

Fix T44102: Mirrored objects render black with Blender Internal and Autosmooth.

Normals are not vertices, we cannot apply matrix's scale to them...

Fix T44089: All addons do not use same default for orientations.

Transformed 'OrientationHelper' class into 'orientation_helper_factory' function,
which returns an OrientationHelper customized class with specified default axes.

Fix T44065: fixed vehicle constraint

Commit ffee7f1a58a18bc08add94176ddffe29809139a6 broke vehicle constraints; this fixes that.

Revert part of D1074 related to acceleration taked into account.
It has been reverted because it was affecting obstacle avoidance
(T44041).

This fix should be backported to 2.74

Fix T44110: Plane track doesn't work when built with scons

For some reason recent change in avoiding non-aligned eigen vectors
was behaving differently for cmake and scons. Made it a bit different
now by storing scalars. This is more robust approach anyway, because
it's not really guaranteed Mat.col() gives a pointer inside data,
depending on column-major vs. row-major storage.

This is to be backported to 2.74 branch.

tweaks to packman build

remove --asroot arg to makepkg

Fix T44076, SSAO in solid mode will disable antialiasing in wireframe
mode.

Yes it will, because those modes stay active. So on user side, expose
depth of field option always (I don't see why not), but disable SSAO in
wireframe/bounding box mode. It is a known limitation that compositing
does not support antialiasing yet, but better give users some more
control.

This could be included in final release but it's not that serious
either.

Make sure matcap icons are within range.

Basically out of range could happen when opening files made in 2.72 when
the new icons for texture painting were added. Apparently some more
caution is needed here.

Fix T43926: Volume scatter: intersecting objects GPU rendering artifacts
Fix T44007: Cycles Volumetrics: block artifacts with overlapping volumes

The issue was caused by uninitialized parameters of some closures, which
lead to unpredictable behavior of shader_merge_closures().