Blender Git Loki

LANPR: Added error message for failed DPIX shaders.

Merge branch 'master' into soc-2019-npr

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/draw/engines/gpencil/gpencil_draw_utils.c

LANPR: make format.

LANPR: Fixed an accidental if() bracket error in lanpr_line_crosses_bounding_area().

LANPR: GP stroke bake function.

LANPR: selective line type now working for objects and collections

LANPR: ensure chain only contains one type of segments.

LANPR: collection line type selecot and default values.

LANPR: first-time chain only includes the same type of lines.

LANPR: enable switch now operative in software mode

LANPR: modified modifier and main panel UI for clarity.

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

LANPR: modified "item" into prev/next in lanpr_data_types.h

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/draw/engines/gpencil/gpencil_draw_utils.c

LANPR: collection GP target now working.

LANPR: collection and object usage flags now effective. object flags overrides modifier.

LANPR: Object usage flag is effective now.

LANPR: move "usage" settings into struct ObjectLANPR.

LANPR: separate thresholds for image/geometry space chaining.