Blender Git Loki

added depth-alpha line style control (pre multiply)

Merge branch 'blender2.8' into greasepencil-object

Add: depth controlled line width.

Added multisampe support functions in DRW. transform_to_screen later.

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

Conflicts:
source/tools

Move multisample textures to texture list

If the texture is in e_data is shared for all viewports and fails.

Cleanup GP multisample code

Merge branch 'blender2.8' into greasepencil-object

Merge branch 'blender2.8' into greasepencil-object

Merge branch 'blender2.8' into greasepencil-object

Merge branch 'blender2.8' into greasepencil-object

Cleanup: Remove unused line

WIP: Add parameter to multisample

Add a new User Prefs parameter to control GP multisample AA

For general use of Viewport the multisample AA is not required and can produce errors in selection, but for grease pencil the AA is required all the time to get smooth lines, so a new parameter has been added to User Prefs screen to define this value.

If we use the same value for both AA (grease pencil and Viewport), the viewport would be intefered by grease pencil settings.

The new value is below Viewport Samples.

By default the value was set to 4 samples.

This changes was done as result of requirement of grease pencil development team artists.

Merge branch 'blender2.8' into greasepencil-object

Fix errors after merge

Merge branch 'blender2.8' into greasepencil-object

source/blender/editors/gpencil/gpencil_edit.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/gpencil/gpencil_utils.c
source/blender/editors/space_view3d/view3d_ruler.c

Changes in Fill tool

There were some problems with the mouse position and the new TopBar.

Some changes done in order to avoid get_pixel error, but I could not reproduce the crash in Windows.

Merge branch 'blender2.8' into greasepencil-object

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
release/scripts/startup/bl_ui/space_view3d.py
source/blender/editors/object/object_ops.c