Blender Git Commits

Merge branch 'blender2.8' into asset-engine

Conflicts:
source/blender/blenkernel/BKE_library.h
source/blender/blenloader/intern/versioning_280.c
source/blender/blenloader/intern/versioning_defaults.c
source/blender/windowmanager/WM_api.h

New Rim FX shader effect

This effect allows to create a rim around the whole drawing.

A mask color can be defined in order to keep drawing lines below the rim.

Reorder FX shader types

Merge branch 'greasepencil-object' into temp-greasepencil-vfx

Rename variable after merge

Merge branch 'blender2.8' into greasepencil-object

Add annotation layer with the right name

When adding layers, the name of the layer is different for grease pencil object and annotation.

Merge branch 'blender2.8' into temp-tab_drag_drop

Cleanup unused code

Merge branch 'greasepencil-object' into temp-greasepencil-vfx

Merge branch 'blender2.8' into greasepencil-object

General cleanup and more documentation

Remove the mesh sample from fiber curve data.

Fiber curves are simple shapes for fibers now, not tied to a particular
place on the scalp mesh (cf. shape keys).

Fix fur curve generation function.

Simple hair curve generation for testing per-follicle curves.

Add common ui draw function for hair display settings.

Remove unused properties_hair.py file.

Fix ui script for the hair modifier.

Merge branch 'greasepencil-object' into temp-greasepencil-vfx

Replace parent indices and weights with single curve index.

Curves can be shared between follicles, but there will only be one
curve per follicle for defining the shape.