Blender Git Loki

Merge branch 'master' into gooseberry

Conflicts:
source/blender/makesdna/DNA_object_types.h

One more compile fix

Fix compilation errors

Add API to IMB_thumb to enable thread safety.

Indeed, though rather unlucky, we may end up handling same source file from
different preview threads, which could lead to conflicts and bugs.

So idea is to add a simple way of locking a given source file path, since
thumb handling of different paths shall never conflict.

Note that this adds some 'generic' stuff to GHash and Threads area, that are to
be committed separately of course.

Remove anything which deals with transforming a grid.

This needs to be done in a more sensible way.

Remove dead code.

Revert "Cycles: add support for transforming the grid (pos, rot, scale)."

This reverts commit 9514191b0cd63457f6f15d3eb7362651a57f1fec.

Cycles: take radius of the sampling kernel into account for ray
intersection.

As the samplers are hidden in a single class, the radius is set to the
largest.

Previews: do not keep preview task and timer running continuously in 'Preview' mode.

The task was not so annoying (workers are just sleeping anyway), but having the timer
always checking for updates was not so nice. This remains quite minor optimization probably...

So now, we do not start anymore preview task when enabling previews. This is deferred
to the moment we really need it (i.e. when we cache block of entries currently visible).
Preview timer is started at the same time.

Further more, when preview task has been inactive for about one second (i.e. all
queued previews have been handled, and no new one have been queued), we free it
(switching to some kind of 'standby' mode).

This also allows to avoid stoping/restarting preview tasks on each redraw when user is scrolling.

Remove queing TODO previews when starting preview task, this is already handled
(in a better way) by filelist_file_cache_block().

Merge branch 'master' into experimental-build

Fix windows bug with scons builds.

Classical bool vs char value mismatch... Here it was leading to a constant re-filtering
of the list, which invalidates cached previews.

Strange thing is, it would look as if Windows CMake builds are using 'real' bool,
while scons ones are using fake char-based one?

Merge branch 'master' into asset-experiments

Merge branch 'master' into gooseberry

Merge branch 'master' into gooseberry

Conflicts:
source/blender/blenlib/intern/BLI_filelist.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_snap.c
source/blenderplayer/bad_level_call_stubs/stubs.c

Accidentally marked as 'rc'

Use shorts for uploading normals to GPU instead of floats.

The range of shorts is acceptable for good looking
normals.

We allocate a buffer with 4 shorts to keep data aligned to 32bit
boundaries. The total mesh cost for full triangle meshes is now
equal to master branch even with index buffers and memory gains
are even more for ngons.

Fix T45253: Particle emitter volume mode and grid mode broken in 2.75.x

This is a regression since dced56f and root of the issue comes to the fact
that grid distribution sets UNEXIST flag during distribution, which is then
being reset in initialize_all_particles().

This commit solves the issue, but it's not really nice and some smart guy
might want to revisit it.

Merge branch 'master' into openvdb

Fix T45251 custom directory not taken into account for image proxies.