Blender Git Loki

Fix T60014: material link pref ignored

The PreferencesEdit.material_link only worked for adding slots,
adding an initial new material didn't respect the preference.

Revert changes to RNA path of undo settings

Too many Add-ons use these settings, we shouldn't break them all after
beta release. RNA and UI structuring are a bit out-of-sync here now, but
that's an acceptable annoyance.

Also adds some slightly nicer grouping in the RNA file, and moves the
Weight Paint Range property to the View category to match the UI.

Merge branch 'master' into userpref_redesign

Fix T58859: render with compositor does not render other scenes.

Fix wrong alpha blending for datablock preview icons.

Fix (unreported): unpredictable crashes when it is done snap after automerge.

The `em->tottri` of an evaluated object can be different from the actual amount of looptris.

Merge branch 'blender2.7'

Fix T60061: Cycles OSL point density not working.

Add override keywords so we can detect when the function definitions change.

Merge branch 'master' into greasepencil-object

GP: Basic Lasso Cutter support

GP: Remove correction factor in Cutter

This factor makes better cuts, but breaks other cuts, so the next operation is not working.

Maybe in the future we can add this as a parameter.

Fix T60037: single column layout breaks file browse button.

GP: Draw: Speedline guides

Initial commit for artist feedback.
Provides drawing guides or constraints for drawing lines.

Notes:
UI Panel in 3D view. Some settings only have keyboard access at the moment.
Alt-C: Screen space position of circular guide
C: Circular guide
L: Parallel line guide
M: Flip direction 90� degrees
V: Freehand mode (turn off)
J/K: For line guide, rotate guide (alt 45�, shift 15�)
Alt-L: Set angle to that of the last stroke (useful to align to freehand strokes)
Ctrl-L: Set angle to 0�

Todo:
On screen guidelines

Fix T59063: operator search menu loses background in some cases.

Fix wrong grease pencil shader FX usage of object location.

It should use the evaluated object location, and not add any unnecessary
dependency on geometry data.

Fix T59792: Cycles crash rendering motion pass with motion blur enabled.

Merge branch 'master' into greasepencil-object

Fix T60051: Wrong stroke projection when viewmode set to Front

As the z-depth is calculated using the internal drawing, if we use the front mode the z-depth is wrong. The Front or Back mode must be used only for display, but not for calculation.

Fix T60046: crash with Cycles viewport render and particle info node.

This code was not correctly ported to 2.8.

Fix T60031: Joining two Grease Pencilobjects sometimes crashes

The drawing cache was not set as dirty and drawing engine used old data.