Blender Git Loki

Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Merge branch 'blender2.8' into greasepencil-object

Fix errors after merge

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/gpencil.c
source/blender/editors/gpencil/gpencil_data.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/space_view3d/view3d_manipulator_ruler.c
source/blender/editors/space_view3d/view3d_ruler.c
source/blender/makesrna/intern/rna_main_api.c

Cleanup: More style changes

Cleanup: Remove unused struct

These lines were used by old palette system.

Cleanup: Create macros for duplicate code

Cleanup: Rename variables and comments

Now with seperate line thickness factor.

Seperate color demonstration.

Added support for Freestyle edge mark.

Seam and Material lines can be ena/disabled in dpix. Also added UI.

UI: Hack topbar to keep all running while found final design

These changes are only to keep running grease pencil with the last merge.

All these UI elements must be relocated to the right place, but if we don't show them in the UI while we get the final place, the grease pencil is unusable.

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
release/scripts/startup/bl_ui/space_topbar.py

Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/blenlib/intern/rand.c

Remove Draw at Stroke Location

This option at layer level was only for very limited situations and added complexity not needed.

Rename field gradient_boxsize to pattern_gridsize

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/editors/datafiles/CMakeLists.txt
source/blender/makesdna/DNA_material_types.h

Added missing "Custom Properties" panel for GP Objects