Blender Git Loki

Merge branch 'master' into greasepencil-edit-curve

Merge branch 'greasepencil-edit-curve' into soc-2020-greasepencil-curve

Deleted physics fluid python test file

Saving last state of Fluids before deleting

Post review: Made a single try..catch, clean up

Collections: Add color tags to move and link menus

Merge branch 'master' into soc-2020-outliner

Remove deleted header from CMakeLists.txt

Cleaned up mesh test file and added/updated physics test files

Use pragma once

Merge branch 'master' into soc-2020-io-performance

Outliner: Prevent color tag on linked collections

Fix crash due to OBJ files with no `o name` line

In some exporters, the group serves as the object name.

Also add some asserts.

Rename `list_of_objects` to `all_geometries`.

Add debugging to face merge.

Post review: Minor fixes, add documentation

WIP: add fields log related fields to UserDef

Remove comment

Clog: always set start tick

It causes problems when printing timestamp in info editor

Add basic formatting options for log

Merge branch 'master' into soc-2020-info-editor

# Conflicts:
# source/blender/blenkernel/BKE_DerivedMesh.h
# source/blender/blenkernel/intern/DerivedMesh.c
# source/blender/blenkernel/intern/anim_data.c
# source/blender/blenlib/PIL_time_utildefines.h
# source/blender/editors/space_info/info_intern.h
# source/blender/windowmanager/intern/wm_event_system.c
# source/blender/windowmanager/intern/wm_files.c