Blender Git Loki

better handling of attribute name collisions

Mantaflow: Fixed issues raised in part 7 of the review (D3856)

improve ui of Custom Emitter node

Mantaflow: Fixed issues raised in part 6 of the review (D3855)

Mantaflow: Fixed issues raised in part 3 of the review (D3852)

Merge branch 'greasepencil-object' into greasepencil-refactor

GPencil: Fix errors after merge

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/blenkernel/intern/paint.c

GPencil: Remove UV from RNA

These were only for debug and now are not required

Mantaflow: Fixed issues raised in part 2 of the review (D3851)

fix warning

initial Custom Emitter node

support nested properties in inferencer

new Value node

Mantaflow: Fixed issues raised in part 1 of the review (D3850)

initial support for custom particle attributes

Merge remote-tracking branch 'origin/master' into temp-lanpr-review

optimize some math nodes

deduplicate code

Merge branch 'greasepencil-object' into greasepencil-refactor