Blender Git Loki

Merge branch 'greasepencil-object' into temp-greasepencil-vfx

Fix parameter type 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/gpencil/gpencil_intern.h
source/blender/editors/gpencil/gpencil_utils.c
source/blender/makesrna/intern/rna_internal.h

Cleanup: Rename Gaussian Blur to Blur only

Complete refactor to reduce memory and several FX

These changes reduce the internal struct data used by shader FX and allow to create several FX of the same type for the same object.

Before, there was a limitiation design to enable several times the same FX type.

Updated ui, more easy to be used. (take advantage of new grouping api)

Refactor Effects loop to reduce complexity

This is the first step to allow multiple effects of the same type.

Cleanup: Reduce number of passes defined

Reuse the same pass for all effects.

Fix a few minor crashes from unfinished hair shader code.

Remove the parent interpolation hair shader and use the transform-feedback shader instead.

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

Fix error in reordering after new items were added.

Fix error in last merge

Was freeing memory too early, it will be correctly freed a few lines later.

Merge branch 'greasepencil-object' into temp-greasepencil-vfx

Cleanup: trailing space

Merge branch '28' into greasepencil-object

Cleanup: unused vars & comment block that doesn't run

Merge branch 'GP-RIM' into temp-greasepencil-vfx

New Colorize Shader effect

This effects is used to convert to GrayScale, Sepia, BW and other color changes.

Merge branch 'blender2.8' into asset-engine