Blender Git Commits

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/blenkernel/BKE_gpencil.h
source/blender/blenkernel/BKE_gpencil_modifier.h
source/blender/editors/include/ED_gpencil.h

GPencil: Disable Stroke in Solid Fill default material

GPencil: Rename material Boxes Stroke to Squares Stroke

Add uuid support to main_idmap.

GPencil: Fix Use cursor Popover

- Fix color in modes not used.
- Enable cursor by default.

GPencil: Remove Substract color for Weight Paint brush

This is not used now.

Fix build error after changes from last merge

Merge branch 'soc-2019-openxr' into vr_scene_inspection

Merge branch 'functions' into builtin-simulation-nodes

fix after merge

Merge branch 'master' into functions

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

Workbench: Refactor: Add Shadow support

Update oculus.json file for the Oculus runtime on Windows

Fix compiler warning on Linux, swapping with wrong type

Bring back vertically mirrored drawing for DirectX compatibility

Always do versioning code, even with WITH_OPENXR disabled

Always generate XR-RNA, even with WITH_OPENXR disabled

Cleanup: Move struct forward declaration to top of header

GPencil: Fix struct alignment error after merge