Blender Git Loki

Merge 'master' into 'cycles_adaptive_sampling'

Cleanup: correct comment

UI: move region toggling to properties

Each space had separate operators, duplicating logic.

Use RNA properties instead so adding the ability to toggle other
region types (floating redo region for eg) doesn't need to have an
extra operator per space type.

It's also nicer to show a check-box for something which can be toggled.

CMake: correct bad change to ceres linking

Revert part of 45055199a2e51

Fix T63513: Gpencil - Circle guide activation with shortcut "C" is not working properly

Only add missing events after first point is added.

Disable clang-format for Libmv

This is an odd-ball: it's a library which has own style and
guidelines, and just happened to be developed by Blender developers
and also happened to rely on some functionality of intern/ for its
C-API.

Might consider using Google's clang-format in the future (this is
what the style is supposed to be in this library).

Fix compilation error when using SDL dynamic loading

Merge branch 'blender2.7'

Buildbot: Attempt to fix wrong branch in buildinfo

For some reason the buildinfo header was not re-generated. The root
reason is not really clear to me, so simply remove the header similar
to the CMake cache.

Fix T63663: Object mode proportional editing affects objects which are disabled for selection

Objects which are not selectable are no longer affected by
proportional transformations.

Cleanup: remove last bits of WITH_LEGACY_DEPSGRAPH CMake option.

Legacy depsgraph has been removed from Blender since several months
already...

support conversions in all directions between bool, int and float

Overlay Engine: Option to Disable AA Ortho Grid

When in Axis alligned orthographic view a grid was always displayed.
With this change the user can enable/disable this grid.

The Grid is always visible and editable, but only rendered active when user is in quad view, or axis aligned ortho view.

Reviewers: brecht, fclem

Maniphest Tasks: T63517

Differential Revision: https://developer.blender.org/D4699

update inferencing to new type rules

concept of conversion groups in type system

start using a better defined type system

Merge branch 'master' into greasepencil-object

implicit conversions between float and integer lists

Merge branch 'master' into functions

Fix mistake in recent commit.

Needed to remove footers and not headers