Blender Git Loki

Fix error after merge

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/editors/gpencil/gpencil_data.c
source/blender/editors/gpencil/gpencil_edit.c
source/blender/editors/util/undo.c

Fix color names for monkey

The colors were missing after save and load again.

Cleanup: Move all Shader creation to engine_init

Merge branch 'blender2.8' into greasepencil-object

Fix blur shift when add more samples

The image was moved to top when increase the sample number. This was due the shader was bluring both axis at the same time.

Cleanup: Use always even numbers for samples

Cleanup: Simplify shader parameters

Restructure VFX Blur, add Samples and cleanup

Now, the number of defined passes is low and there is a new parameter to define number of samples.

Merge branch 'blender2.8' into greasepencil-object

Cleanup unused variable

Replace constant bokeh value by parameter

Fix compilation error after merge

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/gpu/GPU_shader.h

Fix DOF render segment fault and use Eevee UI options

To activate the DOF for grease pencil, the Eevee option is used as main flag.

Merge branch 'greasepencil-object' into GP-DepthOfField

Merge branch 'blender2.8' into greasepencil-object

WIP: Fix alpha channel and replace by weights

Still there is a problem with the external border.

Thanks Cl�ment for the help.

WIP: More work on shaders and framebuffers for DOF

Still there are problems with the alpha factor and all the scene is empty because alpha is always 0.

Remove texture Free for DOF

These textures are freed by draw manager and don't need explicit free.