Blender Git Loki

Fix building error, silence warning, stop double promotion

Cleanup: Remove excessive space

Merge branch 'blender2.8' into greasepencil-object

UI: Get back Pivot point origin

This control was removed by error in previous merges.

This change is temporary while the topbar is redesigned.

Merge branch 'blender2.8' into greasepencil-object

Added DPIX crease fading.

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