Blender Git Loki

Cleanup: tweak last commit

Fix generated toolbar keymap w/ annotation tool

Fix T59944: Template operator_mesh_uv.py fails

Better bevel normal hardening when some faces were smooth.

Harden normals causes normal splitting, which will not give the
appearance expected due to autosmooth unless some edges are sharpened,
so this change fixes that. Also bevel tool will turn on autosmooth
if not already on if hardening normals.

Merge branch 'greasepencil-object' into greasepencil-experimental

GP: Guides: Speedline drawing guides

Initial commit for final testing

GP: Guides: Move guide data to struct

+ Address comments from code review by @antonioya, thanks
+ Fix viewport update when changing reference point uses (rna_ImaPaint_viewport_update)

Cleanup: add trailing commas to structs

Correct error in recent button type check

UI: Use grid-flow layout throughout Preferences

Makes the entire Preferences UI nicely width responsive. Also, move
use_tabs_as_spaces option back to file path options, it was too lonely
in its own panel ;)

Fix typo.

Merge branch 'greasepencil-object' into greasepencil-experimental

Merge branch 'master' into asset-engine

Rather painful, too much cleanup/renamings in between...

Note that this is not currently functionnal, builds but does not show
AEs in filebrowser selector for some reason. No time to track that now.

Conflicts:
source/blender/blenkernel/intern/library.c
source/blender/blenloader/BLO_readfile.h
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_defaults.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_file/filelist.h
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_script/script_edit.c
source/blender/editors/space_script/script_intern.h
source/blender/editors/space_script/script_ops.c
source/blender/makesrna/intern/rna_internal.h
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_files_link.c

GP: Rename Solo Mode property

cleanup

Merge branch 'master' into greasepencil-object

GP: Fix missing initialization converting 2.7 files

PointerType template

GP: Set Cap mode as Enums

Now the Cap mode is an enum ready for future modes.

Add the cap mode to material is not logic because the stroke start and end depends on the drawing direction. Maybe in the future we could add to material, but will need more work at stroke level.

The Toggle operator keeps equal in a circular switch mode. We can improve it also in the future.

do value copying and cleanup