Blender Git Commits

Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/library_remap.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_defaults.c
source/blender/editors/space_file/space_file.c
source/blender/makesdna/DNA_space_types.h
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_files_link.c
source/blender/windowmanager/intern/wm_init_exit.c

[Fast import/export] Added option to disable deduplicating UVs and normals and small refactoring

Merge branch 'master' into functions

GPencil: Redesign Grab evaluation transform calculation

Still problems with single points strokes

GPencil: More test to apply evaluated rotation in Sculpt

This is an experimental commit

new: Collada added global orientation transform to export

Merge branch 'master' into collada

better cross platform exponent computation

more assertions in ArrayLookup

create ArrayRef from std::vector and std::array

cleanup SmallMap

ArrayRef constructor for SmallSet

correct small object optimization for sets and maps

improve SmallStack class

more efficient small vector extend

fix memory leaks in unit tests

remove unused StringCollection

cleanup ScopedTimer

Merge branch 'master' into functions

[Fast import/export] Fixed compile error

Including BKE_mesh.h before BLI_sys_types.h creates a compile error, where uint isn't defined.
This is strange and I'm not sure where it comes from, but I think it's a consequence of some change in master.