Blender Git Loki

Cleanup redundant variable

Fix errors after merge

fix smoke / manta rename in quick effects

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/editors/space_outliner/outliner_select.c

Cleanup: newlines left in messages

fix smoke / manta rename in UI

replaced WITH_SMOKE macro with WITH_MANTA in entire project

for a mantaflow build, one now only has to enable the WITH_MANTA macro

Merge branch 'master' into blender2.8

Cleanup: remove unused view_layer argument

Cleanup: move undo into it's own directory

Split out undo API from ED_util.h into ED_undo.h

clean up and fixed some warnings

fixes broken linux build

Cleanup: move BKE_global include under ifdef's

Undo: store active curve shape key in edit-mode

Logging: use for Python API

Adds categories "bpy.context" & "bpy.rna"

minor stability improvements for new adaptive inflow setup

imbuf: revert some of the changes of rBb6ba3c682dd6615e760905572a5bcd69bb46371f since they broke the build.

Fix compiling with Alembic

Still need G.main

Workaround for undo steps not storing object modes

Cleanup: Make code more compact

Recover line deleted by mistake in previous commit

Still there is a problem when the undo change to a non GP object.