Blender Git Loki

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/editors/gpencil/gpencil_edit.c
source/blender/editors/gpencil/gpencil_primitive.c

GPencil: Drawing locked to 3D cursor (wip)

Now it's possible to draw strokes attached to a plane locked to 3D cursor.

Still pending the lock in Sculpt mode.

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-object

GPencil: Cleanup unused shader code

After last changes, some code is not required and only adds noise lines.

GPencil: Text flip vertical to texture stroke

GPencil: More test for textured strokes

Now the texture is inverted in alternate segments.

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-object

GPencil: Display color names only in Edit mode

Merge branch 'master' into greasepencil-object

GPencil: Add support to color names for selected strokes

When enable names display in object panel, the color of each selected stroke is displayed in the viewport near to the first selected stroke.

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-object

Type error

Merge changes

Merge branch 'master' into soc-2018-npr

# Conflicts:
# release/datafiles/locale
# release/scripts/addons
# release/scripts/addons_contrib
# source/blender/draw/intern/DRW_render.h
# source/blender/makesdna/DNA_light_types.h
# source/blender/makesdna/DNA_scene_types.h
# source/blender/makesrna/intern/rna_scene.c
# source/tools

GPencil: More test to textured strokes

Now, the UV is inverted by section (a full texture width) and not by point.

GPencil: Fix error after merge

Missing field rename.