Blender Git Loki

Merge branch 'master' into greasepencil-object

Conflicts:
release/scripts/startup/bl_ui/properties_paint_common.py
release/scripts/startup/bl_ui/space_view3d.py

GPencil: More changes after merge

merge 'master' into greasepencil-object branch

GPencil: Remove Transparent option in Swirl VFX

This has been deprecated.

GPencil: Versioning patch for Colorize VFX

The old Gray and Sepia modes were not using the factor and now the blend is defined with that, so need to be set to 1.0f

GPencil: Display Colorize Factor for all modes

Now the factor is used in all modes.

Merge branch 'greasepencil-object' into greasepencil-refactor

Merge branch 'master' into greasepencil-object

GPencil: Fix missing mask icon in Dopesheet

The new mask icon was not displayed in Dopesheet channel.

GPencil: Refactor: Add Wave FX

Use the same shader as flip fx because we only transform the uvs and
sample once.

GPencil: Refactor: Add Swirl FX

The angle is no longer mulitplied by 8. We need to change the UI and patch
old files to preserve an appropriate slider feeling.

The Swirl FX (like others) is now affected by distance of the source object.

Transparent option has not been reimplemented as you can use masking for
that.

GPencil: Refactor: Add Flip FX

GPencil: Refactor: Add Colorize FX

The behavior has been changed quite a bit to work with separated
transparency layer.

- The custom mode now just blend between the original image and the
same image with the color changed and luma kept as is.
- Grayscale & Sepia mode now blend with the original image using the factor.
- The duo tone do not do a sharp separation of colors. It just color the
original in 2 different color using a hard separation threshold.

Cleanup: GPencil: CamelCase for uniform and fix a wrong comparison

GPencil: Refactor: Put blend mode shader code into gpencil_common_lib.glsl

This is because the rim fx needs the same code.

GPencil: Refactor: Add Rim FX

Nothing has changed functionality wise.

GPencil: Set default VFX Shadow color to Gray

Merge branch 'greasepencil-object' into greasepencil-refactor

Merge branch 'master' into greasepencil-object

GPencil: Remove arbitrary limit to only one VFX