Blender Git Commits

Merge branch 'master' into greasepencil-object

GP: Guides: Set status back to idling after exiting cp mode

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-object

GP: Guides: Fix snapping distance

Use pre-existing code to determine the pixel scale.

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-object

GP: If no collision restore selection of points

If no collision, the selection only selected the vertex as vertex mode and don't extend selection.

GP: Remove with Cutter strokes of 2 points

As thess strokes always generate an autocollision, it was impossible to delete them.

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/editors/gpencil/gpencil_paint.c

GP: Guides: Change keys to release event

GP: Guides: Change units from px to blender

Based on GP team feedback

+ Tidy and also fix issue of not snapping to nearest guide

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/makesdna/DNA_gpencil_types.h
source/blender/makesdna/DNA_scene_types.h

GP: Support Cutter in same stroke

Before the cutter only worked with different strokes, but now can handle selfcollisions.

Also added code to avoid infinite loops.

GP: Guides: UI Cleanup

Remove enable option from menu
Remove cursor location

GP: Cleanup compiler warnings

GP: Cleanup - Remove commented UI code

Merge branch 'master' into greasepencil-object