Blender Git Loki

Merge branch 'master' into greasepencil-object

Conflicts:
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c

use action context in mesh emitter

use more generic mesh surface action context

fix temporary deallocation

simplify mesh emitter more

Merge branch 'master' into asset-engine

cleanup mesh emitter

sample varying float4x4

extract triangle sampling

extract birth moment computation

Merge branch 'master' into functions

Merge branch 'master' into greasepencil-object

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

Remove flag to disable categories per region-type

Just set a dummy bl_category to avoid warning prints.

Remove 'HIDDEN' panel flag, use existing convention

Existing convention is to register the panels for a header, which means
they're not drawn by default anyway.

Merge branch 'master' into filebrowser_redesign

Cleanup code

GPencil: Fix compiler warning

Merge branch 'master' into greasepencil-object

The tri-tri intersection code partially hooked up.