Blender Git Loki

Merge branch 'master' into temp_custom_loop_normals

Conflicts:
release/datafiles/blender_icons.svg

Mostly some refactor in preparation of advanced data mixing.

UI and properties support for having "Filled" GPencil Strokes/Shapes

Merge branch 'master' into mesh-transfer-data

GPencil Draw Operator: Implemented proper method to delay start of drawing

When running GPencil drawing operators from the toolbar or from a (pie) menu,
drawing operations shouldn't start immediately, but rather, only when users
actually click to start drawing. This is because the mouse is often not in a
suitable location for this to work when the operators get invoked from such
UI controls.

Previously, we used a hack which just detected certain types of events. This worked
ok for toolbars, but not for menus. Now, we've got a proper property to enable this
behaviour instead.

readGridFromMemory correct dimensionality

Libmv: Fix wrong search area clamping in frame accessor

Not sure who was that smart to make it wrong :)

Hopefully it'll fix the "magnetic" borders reported by Sebastian,
when the marker gets "attracted" by the frame bounds.

Merge branch 'master' into libmv_prediction

Expose Grease Pencil "Convert to Curves" operator directly in toolbar instead

It only really applies to the 3D view, so this makes more sense, and fits
the workflows for modellers and mograph artists more.

Tweaks for Delete Active Frame in GPencil UI

* Expose "delete active frame" directly in GP UI (alongside frame locking)
instead of hiding in a submenu
* Deleting the active frame immediately makes the one before it active

Bugfix: Fix for potentially uninitialised matrix, and 2D eraser being broken following recent changes

GPencil: Refactor out space conversion APIs in response to Sergey's changes

Merge branch 'master' into GPencil_EditStrokes

Conflicts (Unresolved):
source/blender/editors/gpencil/gpencil_paint.c

Code Cleanup - Remove dead code

Border Select for GPencil strokes

Modified GPencil pie menu to work with edit modes

after merge fix

Merge remote-tracking branch 'origin/master' into multiview

unnecessary calls to Mantaflow removed

SSAO introduce quality settings

Basically change the way SSAO samples the screen by using a circular
filter instead. This is inspired by HBAO though we still don't use this.

The quality settings change the number and density of samples. We can
definitely improve things here though.

We also jitter the sampling locations per pixel. Generally this adds a
kind of noise. Some banding is, unfortunately still apparent and small
distances will introduce noise. This can be fixed but I will have to see
if it can be done without much of a cost.