Blender Git Loki

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

Merge branch 'blender2.8' into greasepencil-object

Redo Rim FX Blur

The previous implementation was doing the blur in the wrong step and the result was very bad.

Now, the Rim mask is blured before blending with the final image.

Fix: Icons for annotation tools now show in toolbar

Icons for Grease Pencil/Annotation tools

These were in the icon_geom.blend file in SVN (lib/resources),
but needed to be manually added to the Export group for this to
work.

They are needed for use for use with the annotation tools.

NOTE: There are currently problems running the icon generation
scripts in the gp-object branch due to some file loading pointer
remapping problems there causing segfaults when running the script.
Thus, I generated these icons using the 2.8 branch, then cherry-picked
that commit over to this branch.

Fixes for incorrect version patching code introduced in b6776304e76a

* newlibadr() shouldn't be called from direct_link_* functions
Besides, the pointers in question get corrected in
lib_link_material() already

* Added expand_doit() calls for the sima and ima pointers.
Following what's done for tex->ima, these also get expand_doit() calls,
since they increase the usercount of images when used.

Cleanup: Remove the obsolete "ts->gp_brushes" field

This isn't used or accessed from anywhere anymore, so time to remove it

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

Merge branch 'blender2.8' into greasepencil-object

Enable Grease Pencil paper in edit mode

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

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/blenkernel/intern/object.c

Fix missed materials after append GP object

Add Blurrines parameter to Rim FX

WIP: Blur only border of RIM

Add Transparent option to Colorize FX

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

Merge branch 'blender2.8' into greasepencil-object

Add samples parameter to Rim FX

Also improvements in drawing.

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