Blender Git Commits

Merge branch 'id_override_static' into asset-engine

Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_ID.h

Merge branch 'blender2.8' into id_override_static

Merge blender2.8 branch.

This means that from now own, we work based on Blender2.8!

Conflicts:
source/blender/blenloader/BLO_readfile.h
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_file/filesel.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_text_types.h
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_files_link.c
source/blenderplayer/bad_level_call_stubs/stubs.c

Merge blender2.8 branch.

Means that from now on, we work based on blender2.8, no more master!

Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/editors/interface/interface_ops.c
source/blender/makesdna/DNA_ID.h
source/blender/makesrna/intern/rna_ID.c

Merge branch 'id_override_static' into id_o2.8

Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/editors/interface/interface_ops.c
source/blender/makesdna/DNA_ID.h
source/blender/makesrna/intern/rna_ID.c

Merge branch 'id_override_static' into asset-engine

Conflicts:
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/node.c
source/blender/makesdna/DNA_ID.h

Merge branch 'master' into id_override_static

Conflicts:
source/blender/makesrna/intern/rna_access.c

Merge branch 'id_override_static' into asset-engine

Conflicts:
source/blender/editors/interface/interface_regions.c

Merge branch 'master' into id_override_static

Conflicts:
source/blender/editors/interface/interface_handlers.c

Fix type of itemf RNA callback...

Merge branch 'id_override_static' into asset-engine

Merge branch 'master' into id_override_static

Fix issues from recent UI API changes in master.

Merge branch 'master' into id_override_static

Add drag'n'drop-linking of material onto object in 3DView.

Probably needs to be reorganized a bit better, but basically working.

Amber: fix some more stupid issues/mistakes.

Amber: Add icon of data type to 'all data' assets add operator.

Amber: Fix bad tag handling in case of empty set.

Merge branch 'id_override_static' into asset-engine

Merge branch 'master' into id_override_static