Blender Git Loki

GPencil: Fix merge error

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/draw/engines/gpencil/gpencil_engine.c

GPencil: Fill: UI Tweaks

GPencil: Fill changes

+ Replace Strokes with Adaptive
+ Remove dilate option, always on
+ UI changes

GPencil: Fix merge error

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/draw/engines/gpencil/gpencil_engine.c
source/blender/draw/engines/gpencil/gpencil_engine.h
source/blender/draw/engines/gpencil/shaders/gpencil_zdepth_mix_frag.glsl

GPencil: Rename variable name and add alpha to outline

The outline now has some alpha to be more consistent with other Blender areas.

GPencil: Disable Outline if Overlay is disabled

The main overlay switch and outline option must be checked.

GPencil: Remove comment line added by error to header text

This line was added accidentally in the header text.

GPencil: Increase outline to 2 pixels

The selection outline of 1 pixel was too thin.

GPencil: Hide selecction outline when play animation

GPencil: Draw Outline to Active and Selected objects

Now an outline is drawn when the grease pencil is selected.

GPencil: Remove dummy marker for Grease Pencil objects

After adding selecction using strokes, the dummy is not required because it was added as a provisional solution while we implement stroke selection.

GPencil: Add selection support for objects using strokes

Now it's possible to select a grease pencil object without using the dummy.

GPencil: Draw Outline to Active and Selected objects

Now an outline is drawn when the grease pencil is selected.

GPencil: Remove dummy marker for Grease Pencil objects

After adding selecction using strokes, the dummy is not required because it was added as a provisional solution while we implement stroke selection.

GPencil: Add selection support for objects using strokes

Now it's possible to select a grease pencil object without using the dummy.

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/editors/gpencil/gpencil_edit.c
source/blender/makesdna/DNA_brush_types.h
source/blender/makesrna/intern/rna_brush.c

Merge branch 'master' into greasepencil-object