Blender Git Loki

Merge remote-tracking branch 'origin/master' into experimental-build

Sequencer: Fix for monoview videos showing blank for missing views

Sequencer: small style cleanup, and small code order change

Sequencer: unify the code to get the name of the files when using multiview + individual images

Sequencer: small refactoring of the multiview image rendering code

Sequencer: remove unecessary 1-liner

Replace BLI_listbase_count() by BLI_listbase_count_ex() when possible

Merge remote-tracking branch 'origin/master' into multiview

Include manual fixes for BLI_listbase renames

Merge branch 'master' into depsgraph_refactor

Revert "Squashed commit of mesh-data-transfer branch."

This reverts commit 67b24066c285f7a8e995cef96a0082497deb5a6a.

Squashed commit of mesh-data-transfer branch.

Merge branch 'master' into experimental-build

Merge branch 'master' into mesh-transfer-data

Finalize transfer datalayout for vgroups.

As best as possible I think, given the specificities of vgroups (mix of object and mesh data).

Merge branch 'wiggly-widgets' into gooseberry

Conflicts:
source/blender/editors/include/ED_view3d.h
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/transform/transform_manipulator.c

Merge branch 'master' into mesh-transfer-data

lost instance of transform manipulator

Merge branch 'master' into wiggly-widgets

Bring back the old manipulator code, it works better with the transform
system for now. Backup the old code in a new file

Tweak to stroke editing drawing - Only show stroke points when in editmode