Blender Git Commits

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/blenkernel/BKE_blender_version.h
source/blender/blenkernel/intern/gpencil.c
source/blender/blenkernel/intern/gpencil_modifier.c
source/blender/editors/gpencil/annotate_paint.c
source/blender/editors/gpencil/gpencil_edit.c
source/blender/editors/object/object_hook.c
source/blender/editors/space_clip/clip_graph_draw.c

GPencil: Revert wrong merge of LANPR branch

Due to an error, the code of LANPR branch was merged accidentally to the Grease Pencil branch.

This commit reverts all work to the last correct commit.

The command executed was: `git diff ff7482286319e7b462b98dc26909b47d9d661ec6 | patch -p1 -R`

Thanks to @dfelinto for fixing the error.

Merge branch 'master' into greasepencil-object

GPencil: Update stroke loop after merge using macro

During merge, the loop back to old style using for's and now it's using the macro.

Merge branch 'master' into greasepencil-object

GPencil: Merge by distance (WIP)

Initial implementation of merge by distance
GPencil: Fix duplicated CMake entry


GPencil: Add missing code for operator in previous commit

Merge remote-tracking branch 'origin/greasepencil-object' into soc-2019-npr

GPencil: Cleanup tarnsform rotation function

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-object

GPencil: Add Edit support to Length modifier

Now the modifier is visible in edit mode.

GPencil: Fix missing modifiers initialization

This was missing when the modifier was ported from NPR branch

GPencil: Cleanup more compiler warnings

GPencil: Remove compiler warnings

Cleanup: Fixed some warnings in editor/lanpr.

GPencil: two modifiers from LANPR branch.

LANPR: UI refactor: line layer ui list use name.

LANPR: UI refactor: collection usage panel.

LANPR: Object usage flag now in LANPR tab.

LANPR: UI refactor: modifier ui now put into separate tab.