Blender Git Loki

Collections: Add color tagging and use in outliner

Add a color tag to collections and allow tagging from the outliner
context menu.

Show the colored icon in UI menus.

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

Collections: Include new collection color icon

Collections: Add color tagging & use in outliner

Add a color tag to collections and allow tagging from the outliner
context menu.

Show the colored icon in UI menus.

Merge branch 'master' into soc-2020-outliner

Better performance when there are clusters of coplanar triangles.

Quiet const warning

Cleanup: Remove broken context menu mode toggle code

The outliner context menu had an operator to enter/exit modes, but it
only showed when the objects were in modes. Additionally, I'm not
certain how much it was used since it has been broken for a long time
and no one has reported it.

Entering modes through the context menu could be a nice feature, but I
think it would be an easier problem to solve after a context menu
refactor.

Cleanup: Outliner mode toggle warnings

Remove warnings from unused parameters.

Cleanup: Remove unused outliner select code

No functional changes.

Cleanup: Remove unused tree sort code

No functional changes

Merge branch 'master' into soc-2020-outliner

GPencil: Replace Trace to use Empty images

Instead to use the Image Editor, now it uses the current selected Empty image

Merge branch 'master' into soc-2020-outliner

CleanUp: Remove unused code

Cycles: never hard code -1 for t_max when calling light_sample

CleanUp: renamed idname of image draw engine

CleanUp: renamed draw_engine_editors_type to draw_engine_image_type

Code Cleanup: removed unused import + format

Moved batch creation to draw module

Merge branch 'master' into lanpr-under-gp

Conflicts:
source/blender/editors/space_buttons/CMakeLists.txt