Blender Git Loki

Merge branch 'master' into strand_editmode

Conflicts:
source/blender/editors/sculpt_paint/paint_ops.c

GP Sculpt: Dampen down the timer speed on the Thickness brush to be more manageable

GP Sculpt: Pinch brush also uses the timer now

GPencil EditMode: Some fixes to allow mode switcher to still work when there's no active object

GPencil EditMode: Manually setting the editmode setting also syncs ob->mode now

Since this is for the RNA version, we only check if the datablock is being used
by the scene or active object (whereas the operator checks whether we're operating
in a 3D view).

GPencil EditMode: Only sync editmode with ob->mode in 3D view

Code Cleanup: Move the editmode toggle operator to another file

GPencil Stroke Editing: Stroke Editmode now behaves like other editing modes for objects

You can now enter stroke editmode from the usual mode dropdown in the 3D View
header. While this isn't strictly correct (data-wise, GPencil datablocks can
belong to stuff other than the active object), for the most common use case
of usage in the 3D view, this is appropriate.

Notes:
* This still needs more careful checking to ensure correctness/consistency of
behaviour in all edge cases (e.g. gpencil datablock in a different editor,
or user manually changed the mode toggle, etc.)

Merge branch 'master' into object_nodes

GPencil Stroke EditMode: Replace 3D view menus when in stroke editmode

After playing around with the current workflow the other day, it became clear
that the current editing workflow could still do with some tweaks to be more
convenient.

* To make it less confusing/ambiguous what "mode" we're in when editing
Grease Pencil strokes, and also to provide another way of seeing all
the available operators, the Select and "Edit" menus in the 3D View
header now show Grease Pencil specific lists of operators now.

* Also, added a quick-access button to the header to toggle onion skinning.
Even with the Pie Menu and the Properties Panel, the existing ways of
quickly toggling this aren't good enough.


TODO:
* The "Mode Selector" is now the next target to tweak. As Strokes EditMode is not
a per-object setting, but rather, per GPencil datablock, this will be quite hairy
to hack around.

GPencil Keymap: Pen Eraser can now be used for erasing strokes

Using the keymap support added in the previous commit, we can now map the
pen's eraser to trigger erasing.

Pen drawing support is not enabled though, since users who use a tablet as
their primary pointing device will want to be able to continue using it
for things like selection, grabbing manipulators, and sculpting/texture painting.

Added support for tablet pen and eraser events to be added to keymaps

Added two new event types that will fire only when using a stylus or its eraser.
The use case for this is to allow artists to be able to set up their keymaps
so that they can just draw and erase directly using their tablet without holding
down any keys.

fixed setup when with_manta flag is disabled

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/blenkernel/BKE_blender.h

Merge branch 'lib-link-rework-temp' into id-remap

Also, fix some issues in previous code.

Some naming cleanup.

Rework a bit new liblink code, to use our beloved memarena instead of ugly pile of malloc.

Performances are not an issue at all here, but it makes code slightly simpler, avoids
a loop over ghash of libs, avoids some potential mem fragmentation, and will be easier
with lib relocate code too in future...

Consider proxy objects as 'linked' ones when it comes to ID remapping.

Reason is, on next fileread, proxy will be assigned with its target's data again...
Note that this may not be true about all its datablocks pointers - but proxy objects
are really brittle in current code anyway, they could use a serious work as well.

Moar cleanup, some fixes towards sanier handling of remap & indirect data...

Proxy are still not correctly handled here though.

Merge branch 'master' into asset-engine