Blender Git Loki

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

Improve thickness fix when no locked axis

There was some problems with the thickness when the axis was not locked that were not fixed in previous commit.

Merge branch 'blender2.8' into greasepencil-object

Fix error when axis not locked

The size of the stroke was not correct when the axis was not locked.

It needs a vector to the view to calculate the real size of the stroke.

Redo Fix in previous commit and add missing lines

UI: Remove deprecated property

The OBJECT mode was removed as property.

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 'blender2.8' into greasepencil-object

New parameter to adjust stabilization

Parameter to control the stabilization amount of the brush.

This stabilization works as a dynamic smooth using the previous points to calculate the estimated position and average the position to get smoother strokes.

This is not a replace of smooth factor that works after finish stroke. This new parameter is applyed while drawing before ending the stroke.

Fix: Depsgraph was complaining in debug mode about the "geometry_eval" opnode for GPencil not having any function attached

In future, maybe we should move the derived_gpf calculations
(and by extension, the modifier-evaluation loops) into the
BKE_gpencil_eval_geometry() callback added in this commit.

WIP

GP drawing: Try to init the eval_ctx from draw_ctx, if C isn't provided

Outliner: Support moving objects from/to group internal collections

Outliner: support Add Selected to group internal collections

Remove "Group Collection" functionality

This may get "double-reverted" in the future. But we want to separate this
from the main patch before merging it. And then eventually merging them
separately.

Merge remote-tracking branch 'origin/blender2.8' into temp-group-collections

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