Blender Git Loki

commit patch

LineArt: Fix compiler warnings for windows.

Merge remote-tracking branch 'origin/master' into lanpr-under-gp

# Conflicts:
# source/blender/makesrna/intern/rna_gpencil_modifier.c

Alembic import: add an option to force the addition of a modifier on
every object

This way we can read the full file from Cycles.

add procedurals to update stats

Invoking copy_zup_from_yup() function.

Coding convention fixes.

Removed extraneous printf() call.

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-edit-curve

Conflicts:
source/blender/blenloader/intern/versioning_290.c

LineArt: Use max weight among groups for selection.

LineArt: Smooth weight option.

LineArt: Fix uncaught memory leak in stroke generation.

LineArt: Option for matching input/output vertex group names.

Merge remote-tracking branch 'origin/master' into lanpr-under-gp

Merge remote-tracking branch 'origin/master' into gpencil-fading-modifier

quiet introduced warnings

fix for missing width and height on dicing camera

fix typo in mesh tesselation causing an infinite loop

fix for missing detection of required mesh tesselation