Blender Git Loki

workaround for complain on non-closed previews on exit

Avoid repeating self

move from bpy.app._previews to _bpy._utils_previews

since this is an internal module, having in bpy.app and hidden doesnt make so much sense.

Merge branch 'alembic' into gooseberry

Fix for crash when using cache file paths without slashes in them.

PreviewImage reload: only for 'genuine' icons (i.e. user-modified icons are ignored).

Merge branch 'master' into depsgraph_refactor

Conflicts:
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp

Dynamically add sockets to the node based on the grids available in the
file.

Merge branch 'alembic' into gooseberry

Fix for potential NULL pointer access when looking up strands data from
caches.

The 'find' function was returning a bool value, but this does not
guarantee non-null pointers. Removed the return value to avoid
confusion, now callers should simply check the returned pointers.

Change of cache filter group behavior to allow partial caching.

The filter group was used by omitting any object instances that were
not in the group. This reduces the cache size, but it also entirely
skips objects.

Now the filter group only prevents writing of the actual object data,
but still allows storing dupli instances and dummy entries in the cache.
Any objects from cached dupli lists that don't have cached data (mesh or
strands) will now use the original object data instead.

Merge branch 'alembic' into gooseberry

Fix for running bake operator in background mode without a job.

The cache bake operator would always create a job in the window manager.
However, when running in background mode via a script, the operator can
not be modal and the script would return right after starting the job.
Then Blender is stopped and the baking job with it.

To prevent this the operator now only runs in a job when executed from
the invoke function (or when 'use_job' is set explicitly).

Merge branch 'master' into temp_viewport_fx_merge

Conflicts:
source/blender/editors/gpencil/drawgpencil.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/transform/transform.c

Merge branch 'master' into GPU_data_request

Add missing stubs for buffer generation.

Compilation fixes for C90 - still getting link errors related to buffer
generation routines.

Revert "Squashed commit of asset-experiments branch."

This reverts commit d59c7fe41f6406a53667be3235ed8b7796c7cad6.

Squashed commit of asset-experiments branch.

Merge branch 'master' into experimental-build