Blender Git Loki

Merge remote-tracking branch 'origin/master' into temp-cycles-denoising

improved liquid inflow / generating phi grid

phiObs has to be subtracted from phi and not just from phiIn. otherwise when joining phi and phiIn, some obstacle areas in phi are not set to positive value, stay negative and hence show up as liquid

Cleanup: make code more compact

Increase thickness limit parameter

WIP: new method to calculate scale of the stroke thickness

The previous scale method was not valid because only was affected by viewport, but not by GP object or Stroke location. Now, the pixel size is calculated depending of zdepth and used to scale the stroke thickness.

Maybe there are other ways to do it, but this approach works, so we keep it before finding better methods

Merge branch 'blender2.8' into greasepencil-object

Cleanup: Move scale code to function

WIP: Apply scale to strokes thickness

Fix edit mesh not updating in cycles

Merge remote-tracking branch 'origin/master' into temp-cycles-denoising

Cycles Denoising: Fix shadowing pass calculation

Cycles Denoising: Cleanup offset calulation

Cycles Denoising: Only store lower-triangular parts of XtWX matrix

This saves 55 floats per pixel, which is quite significant with GPU tile sizes.

Merge remote-tracking branch 'origin/blender2.8' into temp-cycles-draw-manager

Merge branch '28' into workspaces

OCIO: Fix crash cause by bad IMM usable.

Use iterator for for do_version_workspaces_after_lib_link

Disabling USE_WORKSPACE_MODE works again

Use uppercase for macros

Cleanup: formatting