Blender Git Loki

Cleanup: use doxy comments, clarify some text

Fix edit-mesh undo using the current selection

Any meshes selected would be added to the mode when reading undo.

Cleanup: style, unused variable

Cleanup: remove EM_IGNORE_LAYER

Call ED_object_editmode_enter_ex instead.

Fix T61047: Undo editmesh separate crashes

Favour G_MAIN in functions that might free it.

Fix image paint undo memory leak

Fix T60660: Texture paint undo removes image

Undo System: add Main argument to encode/decode

Needed since we don't always have the context,
and avoids adding G_MAIN into undo callbacks.

Fix T61028: Crash when entering wireframe view

Correct bool check

Correct comment

Experimental event playback, use for testing events

Reviewers: brecht, mont29

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

Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenkernel/BKE_library.h
source/blender/blenloader/BLO_readfile.h
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_file/filelist.h
source/blender/makesdna/DNA_space_types.h
source/blender/windowmanager/intern/wm_files_link.c

initial CholUp integration

Merge branch 'master' into temp-clang-format

Cleanup: add trailing commas

Improve clang-format output.

Cleanup: trailing commas

Improve clang-format output.

Merge branch 'master' into temp-wm-event-api

Fix T60378: All armatures reset positions on linked collection when ctrl+z used on anything.

Issue actually exists since ages, probably 2.7x update system forced all
armature proxies to be fully refreshed after an undo?

In any case, proxy_from should only be reset for 'local' proxies (i.e.
directly linked datablocks), not for linked proxies...

Merge branch 'blender2.7'