Blender Git Loki

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

IME: Various fixes + usual cleanup

Merge branch 'master' into ime

IME: Fix IME not ending composition after region change

+ adding some asserts

Merge branch 'master' into ime

IME: Deduplicate wmImeData + minor cleanup

* deduplicate use of wmImeData
* add missing "ifdef WITH_INPUT_IME"s
* usual minor cleanup

Minor cleanup

Adressing some of the inline comments from @sergey and @campbellbarton

Merge branch 'master' into ime

Merge branch 'master' into ime

General Review Changes

Main changes:
* avoid using MEM_mallocN on every redraw
* continue implementation of WITH_INPUT_IME CMake flag
* whitespace and code style cleanups

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

Conflicts:
source/blender/editors/space_node/node_add.c
source/blender/editors/space_text/text_draw.c
source/blender/editors/space_view3d/view3d_edit.c

Merge branch master into input_method_editor

Finish support for CMake flag WITH_INPUT_IME

Note: implementation not finished, needs a bit cleanup

Cleanup: Moar whitespace cleanup, plus remove missed printf

Hope that was the last cleanup commit for now :/

Add missing files

set up ime branch

Cleanup: Whitespace, Comments, etc.

It may be a bit early to do such cleanups, there are more important things
to do first, but those things are extremely time consuming and I wanted to
get rid of them first ;)