Blender Git Loki

Merge branch 'master' into mesh_samples

Merge branch 'gooseberry' into hair_immediate_fixes

Conflicts:
source/blender/makesdna/DNA_brush_types.h

Depsgraph: Add proper relations to the boolean modifier

This allows to get rid of some hardcoded relations between transform and geometry
components in the depsgraph itself.

Depsgraph: UNUSED() shouldn't be sued in headers

I'm not sure why it compiled last night and not today tbh.

Merge branch 'master' into depsgraph_refactor

add_relation() now prints errors everytime it can't find a required node

Judging by the results on Koro, we have a long way to go... :(

Fix for memory leaks and potential segfaults with invalid drivers

IME: Cleanup wmIMEData struct

fields saved properly for export, unused code removed

IME: Cleanup - Rename wmImeData to wmIMEData

- picky -

IME: New Branch For Text Button Support Only

This sets up the branch for IME support limited to text buttons only. Text
Editor, Info Editor and Console support has been removed in this commit,
as decision was made to only merge IME for text buttons in 2.73 (the rest
can follow up later).

Merge branch 'master' into ime

IME: Add Missing #ifdef WITH_INPUT_IMEs

IME: Fix Crash on Escape Cancel

IME: Refactor Underline Drawing Code

* ED_text_draw_underline is now UI_text_draw_underline and is used for all
IDE appearances
* usual minor cleanup

Merge branch 'master' into asset-experiments

Add basic 'glob' filter by name feature.

Not much to add, we'll likely add more filtering options (tags, categories...) later,
maybe for now we just need an 'exclude' option for name filter...

Refactor: do not filter each item twice! Mem usage here is not really an issue anyway.

Refactor filtering code, should be easier to add new filter options now.

First selection operator implementation for hair edit: circle select.