Blender Git Loki

Merge branch 'master' into greasepencil-object

Merge remote-tracking branch 'origin/greasepencil-object' into soc-2019-npr

GPencil: Fix errors after merge and compiler warnings

The BKE_text_write function parameter list changed.

Added some UNUSED_VARS to functions in development.

Merge branch 'master' into greasepencil-object

GPencil: Add frame parameter to deformStroke callback

This parameter can be necessary for some new modifiers in development. The parmeter was already there but it was removed, now we back again the parameter.

LANPR: Use GPU_BATCH_DISCARD_SAFE marco.

LANPR: Remove useless GPU_ATTACHMENT_LEAVE flags.

LANPR: Edge/face mark UI now forllows LANPR checkbox.

LANPR: Renamed freestyle edge mark constant into lanpr.

LANPR: Remove freestyle #ifdef's.

LANPR: Rename freestyle edge mark functions to LANPR.

Cleanup: Replace if else if, by Switch

Merge branch 'master' into greasepencil-object

GPencil: Remove old comments

GPencil: Testing idea for changing weights when opacity factor is greater than 1.0

GPencil: Clamp weight in Opacity modifier for Material mode

If the value is not clamped, the opacity gets wild values.

GPencil: Apply opacity only to vertex with weights

GPencil: Fix unreported error in Brush option panel

The options of the material are from object material not pinned material.

If the brush is pinned, the material must be the brush material and not the object material.

GPencil: Modify opacity modifier to use weights inverted

It's more logic consider the no weight as opaque and the weight to transparent.

Also fixed some small issues.

GPencil: Fix error when apply material in Opacity/Hue and Tint