Blender Git Loki

Merge branch 'blender2.8' into greasepencil-object

fix for particle count in UI

was missing count reset

fix for autogenerating inner material, just append at the end of the stack instead taking always the 2nd one

Merge branch 'id_override_static' into asset-engine

Merge branch 'master' into asset-engine

Conflicts:
source/blender/editors/space_file/file_ops.c

Merge branch 'master' into id_override_static

fix: separated comparison angle/distance for break/deform, propagate weakened threshold now

Remove ED_area_global_initialize

Should be fine if global areas call ED_area_initialize now.

Fix small jumps of area rectangles and contents

Should also fix some glitches/jumping on HiDPI screens.

Most of this is related cleanup, actual fix is rather small (check
changes in screen_vertices_scale and WM_window_screen_pixels_y)

Merge branch 'blender2.8' into greasepencil-object

Merge branch 'blender2.8' into greasepencil-object

Merge branch 'blender2.8' into topbar

Add 'x' icon to active workspace tab to delete workspace

Icon could be a bit nicer, but is consistent with other places in the
UI. Code is also a bit hacky, as usual in interface handling...

disabling fractions and enabling moving obstacles again

fractions do not support moving obstacles right now. also, fractions combined with obstacles results in particle leak (likely because of inaccuracies at fluid/obs border when repeatedly subtracting from phi grid - sdf not preserved)

Merge branch 'id_override_static' into asset-engine

Merge branch 'master' into id_override_static

GP Branch Version Patching - Use palette slots instead of creating palettes directly

Revert whitespace edits in interface_utils.c

These appear to be accidental, and are unrelated to the purpose of this branch.

Merge branch 'blender2.8' into topbar

Merge branch 'blender2.8' into greasepencil-object