Blender Git Loki

separate autohide and automerge distances, autohide alone is ok for glass and is faster, while automerge is more useful in conjunction with smooth objects and fix normals, to hide the cracks better, also automerge caused errors with thin glass objects like window panes

BGL: GL 3.0 methods (Framebuffer related)

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/blenkernel/intern/customdata.c
source/blender/blenloader/intern/versioning_270.c
source/blender/windowmanager/intern/wm_init_exit.c

Bunch of minor cleanup

Result struct for storing various points to DerivedMesh and deform during modifier eval.

Own function for finalizing the modifier eval result.

Use a localized ndm variable for the main dm and both possibl orco results.

Proper scoping helps understanding of the code.

Own function for setting up the DerivedMesh input for constructive modifiers.

Use a common function for deform-only modifier evaluation.

The distinction between leading and interspersed deform modifier in the
evaluation loop is superficial. The primary difference is the existence of
a derived mesh (dm), which can be handled optionally. Further conditionals
can be moved outside the loop (dyntopo would immediately cancel leading
deform eval anyway).

Initial support for custom keymaps per widget group

This adds widget-group level, configurable keymaps. This means, for each widget group (e.g. Manipulator Widgets, Camera Widgets, etc), 6 keymap entries are added:
* Widget Activate (action-mouse down)
* Widget Activate (actually deactivate - action-mouse up)
* Widget Tweak (mouse move)
* Widget Tweak Cancel (RMB)
* Widget Tweak Cancel (esc)
* Widget Select (only for selectable widgets - select-mouse)

This might be useful e.g. to set certain widgets to activate on tweak event only to resove conflicts (see manipulator vs. selection with LMB-select conflict), and for things like setting a widget values using shortcuts (not yet possible, but easy to add now).
Further, this greatly improves the IMHO current ugliest part of the widget backend, the event system part/hack :P o/

One remaining issue is that the keymap items only appear using search, they are not displayed in the keymap editor list by default (didn't investigate yet).

Old functionality was ported over to new system, everything should work fine still.

Merge branch 'free-refcount-ids' into id-remap

Clean up `BKE_object_free()` and add `BKE_object_release_datablocks()`.

Similar changed to those done for mesh/curve/mball.

Also, systematically nullify pointers in `_free()` functions, this does not cost
much and can help troubleshooting later.

And tag `BKE_object_unlink()` as an horrible piece of code...

Cleanup of free/unlink/release of ID: mesh/curve/mball.

Renamed their `_unlink()` functions to `_release_datablocks()`, since they do not
unlink anything (not in the sense `BKE_object_unklink()` does, at least)!

Also, added a `const bool do_id_user` to their `_free()`, for consistency, now
relevant `_release_datablocks()` func only gets called when this option is set.

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

Note: the branch currently crashes in blender_camera_nodes.cpp:
BL::NodeTree b_ntree = b_data.node_groups[nodes_tree_name];

The crash was introduced in:
cb7cf523e5c000609f32a382e2c0fcc57f635a42

Conflicts:
intern/cycles/SConscript
intern/cycles/blender/addon/__init__.py
intern/cycles/blender/addon/properties.py
intern/cycles/blender/blender_camera.cpp
intern/cycles/kernel/kernel_types.h
intern/cycles/kernel/svm/svm.h
intern/cycles/kernel/svm/svm_types.h
intern/cycles/render/camera.cpp
intern/cycles/render/camera.h

Merge branch 'missing-libs' into id-remap

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

Merge branch 'master' into id-remap

Merge branch 'lib-link-rework-temp' into missing-libs

Merge branch 'master' into missing-libs

Merge branch 'master' into lib-link-rework-temp