Blender Git Loki

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/makesdna/DNA_brush_types.h

Merge branch 'blender-v2.82-release'

Depsgraph: fix false positive time dependencies for simple drivers.

The dependency graph has to know whether a driver must be re-evaluated
every frame due to a dependency on the current frame number. For python
drivers it was using a heuristic based on searching for certain sub-
strings in the expression, notably including '('.

When the expression is actually evaluated using Python, this can't be
easily improved; however if the Simple Expression evaluator is used,
this check can be done precisely by accessing the parsed data.

Differential Revision: https://developer.blender.org/D6624

Merge branch 'blender-v2.82-release'

Sculpt: Rename Topology Brush to Slide Relax Brush

The full name was "Topology Slide/Relax", but it didn't fit in the
toolbar UI. This was causing some problems:

- The mesh filter that does the same thing is called "Relax"
- We may want to add a "Topology Brush" tool in the future that is more
oriented to retopology task (like creating strips of quads), so by doing
this we avoid having two tools with the same name in the UI.

Reviewed By: billreynish

Differential Revision: https://developer.blender.org/D6590

Merge branch 'blender-v2.82-release'

Fix T71373: Sculpt Mask not extracting correctly on scaled objects

This patch applies the original object scale to the coordinates of the
extracted mask mesh. Without this patch, the mesh was no taking the
original object scale into account and the shrinkwrap will fail.

The other solution would be copying the objecty scale to the new
extracted mask object, but I would like to avoid entering sculpt mode
with scaled objects as it may produce wrong behaviors in some tools.

Reviewed By: jbakker

Maniphest Tasks: T71373

Differential Revision: https://developer.blender.org/D6207

Fix T73080: Remove support for scene radius in Weight/Vertex paint

The 2D paint cursor in the 3D view does not support scene radius in
weight and vertex paint mode. This was also the case in 2.80 with the
old cursor. The option to change the units from view to scene is not
available in the UI in those modes, so I think it makes sense to remove
the support from the code.

The ideal solution could be supporting the new cursor in all paint
modes, but that is going to take more time and it is going to be
problematic in texture paint. After doing this, we can bring this code
back and add the option to change the units to the UI.

Reviewed By: jbakker

Maniphest Tasks: T73080

Differential Revision: https://developer.blender.org/D6586

Overlay: Cleanup Image background implementation

The background images are now rendered normally on a cleared
canvas. They then get masked by the render when the background
is drawn with a special blend mode.

Draw-layers: Get it all to work!

Create the framebuffers for caching viewport rendering results, and
"composite" all layers together once each is drawn. Compositing is a bit
of a big word for this, since we basically just draw all layers on top
of each other with alpha blending.
After talking with Jeroen, we decided to keep things simple for now, we
can add more features (like per-layer color-management) and do small
improvements later.

Fix T53205: Show Smoke Advance Panel at Outflow type

Now hiding the initial velocity and texture panel when flow behavior is set to outflow.

Fix T72975: [Mantaflow] Mesh generation bug

The initial value for phi was too high.

Fluid: Added resume cache boolean to standalone scripts

Exported Manta script was missing the new resume options in the data load functions.

Depsgraph: Correct FPS debug print

It was printing "frame" time instead of FPS.

Other interesting thing to get solved is to solve "drop" in FPS
when there is an idle time in user input.

Current usecase is limited to observing FPS when there is a continuous
stream of events: for example, keep moving vertex in edit mode while
watching debug prints.

GPencil: Cleanup some loops

DRW: Color Management: Do some rearangement of the draw code

This puts the color management functions inside one file.

We group all post transform drawing into DRW_draw_callbacks_post_scene.

Overlay: Fix background covering the outline

Merge branch 'undo-experiments' into undo-experiments-idnames

Merge branch 'master' into undo-experiments

Merge branch 'blender-v2.82-release'