Blender Git Loki

Fix triangle-point test function for a stupid condition. See comment.

make rendering into a loop to avoid callback stack overflow.

remove INVOKE_DEFAULT for rendering, otherwise still cause trouble on windows.

Fix scripts from external editings.

Added one click composition to LANPR.

GP: fix error after merge

Merge branch 'master' into greasepencil-object

GP: Fix error when merge 1 stroke only

Merge branch 'master' into soc-2018-npr

GP: More cleanup and renames

GP: Remove unused variable

GP: Mew Merge Strokes operator

This operator allows to create a new stroke joining several stroke selected points of different strokes.

The new stroke will use the current material.

To use, first select the points to be merged. Optionally can remove the old points and strokes.

The operator is available in Edit mode in the Specials menu and Stroke menu.

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-object

GP: Remove temporarily chord primitive

As this primitive is not defined completely, we remove it now and we can add later. Keep this primitive in the source code can produce errors when move more stable options to master.

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/editors/gpencil/gpencil_intern.h
source/blender/editors/gpencil/gpencil_primitive.c

Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Merge branch 'master' into greasepencil-object