Blender Git Loki

Merge branch 'master' into greasepencil-object

Conflicts:
release/scripts/startup/bl_ui/space_toolsystem_toolbar.py

Merge branch 'greasepencil-object' into greasepencil-refactor

Merge branch 'master' into greasepencil-object

Fix T72945: Can't Change the Thickness of a Stroke

GPencil: Patch old files to enable layer lights switch

With the new switch at object level, the layers must be set to ON by default.

GPencil: Move Use Lights to new Panel

GPencil: Use main Use Lights switch at object level

GPencil: Remove Lights VFX

This has been replaced with real scene lights

GPencil: Enable Use Lights for Layer for new layers

Now by default the option is ON because we have a new switch at object level.

GPencil: New Use Lights flag at object level

GPencil: Cleaunp compiler warning

Merge branch 'greasepencil-object' into greasepencil-refactor

Merge branch 'master' into greasepencil-object

GPencil: Change Monkey and Stroke primitives to linear color

Before it was using sRGB, but now all must be linear.

GPencil: More changes to Simplify Tint

GPencil: First steps to add Simplify to refactor

Also, we have decided to reduce the number of simplify options because now it's not logic.

Still pending the tinting option.

Merge branch 'soc-2019-openxr' into vr_scene_inspection

Merge branch 'temp-openxr-blenderside' into soc-2019-openxr

Merge branch 'undo-experiments' into undo-experiments-idnames

Merge branch 'master' into undo-experiments