Blender Git Loki

Fix text editor undo sync when mixed with other undo systems

Undo rewrite broke test_undo.text_editor_edit_mode_mix.

Relatively harmless since it's only out of sync by one action.

Refactor Vector Math update function.

Cleanup: correct name for scene frame conversion

Thanks to @sybren for pointing out issue from 299ff91ea1fe5

Cleanup: GPencil dissolve operator now uses GP_EDITABLE_STROKES_BEGIN macro

This reduces the number of loops

GPencil: Make GP_EDITABLE_STROKES_BEGIN macro safe when stroke is removed

If the macro was used in a loop where the stroke was removed, the macro failed.

GPencil: New function to dissolve points in stroke

This function will be used for new operators.

Merge remote-tracking branch 'origin/master' into soc-2019-cycles-procedural

Fix Math node backward compatibility. Clamp option.

BrightContrast not working correctly with negative contrast

followup to rB8dd95abb2ff9 (which fixed this for the Compositor node),
turns out this was also wrong for the VSE modifier and in vertex color
operator.

- also adjust min/max for VSE modifier
- also guard against division by zero

Reviewers: brecht

Maniphest Tasks: T67808

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

remove redundant values

GPencil: Add Frame parameter to modifier deformStroke Callback

This commit adds the frame to deformStroke Callback as a preparation for new modifiers that will need this variable.

Actually, the existing modifiers are not using the frame.

move collision info and particle info node in same file

Merge branch 'master' into functions

Fix unreported: length measure displayed on the "Sequence Slide" operator panel

Docs: correct comment for PROP_THICK_WRAP

Fix T63570: Proportional editing resets scaling along Y and Z axis on mouse wheel

`applyResize(...)` considers that `t->values` always represents a `ratio`.
But this is only `true` with the `MOUSEMOVE` event.
The solution proposed is to never change `t->values`.
The result of the final transformation is now written to `t->values_final`.

Reviewers: campbellbarton

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

Cleanup: doxy sections

Fix unreported: Selection of mesh_cage element occluded by the mesh_cage itself.

The right thing is to be occluded by the visible mesh (in the case with modifiers).

Cleanup: spelling

Cleanup: unused variable