Blender Git Loki

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/editors/transform/transform_manipulator.c

Merge branch 'asset-engine' into asset-experiments

Merge branch 'id-remap' into asset-experiments

Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenkernel/intern/library.c

Merge branch 'master' into id-remap

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

Integrate font objects copy/paste with system clipboard

When pasting, the style (bold, material, ...) is maintained, if it was originally copied from Blender.

@brecht, @severin told me that you had thought ideas for this functionality. Let me know if it is along those lines.

TODO: update Blender manual once this get merged

Reviewers: Severin, campbellbarton, brecht

Subscribers: brecht, Severin

Differential Revision: https://developer.blender.org/D1789

Fixups to handle utf8 strings properly

Merge clipboard and internal copy/paste systems for font objects

Untested commit, I think it is crashing at the moment, I will check on it soon

FONT_OT_text_cut_to_clipboard

FONT_OT_text_copy_to_clipboard

Expose FONT_OT_text_paste_from_clipboard to keymaps

change: let fluid move down across other modifiers in case it will be added after fracture which has a couple of other modifiers above it (exception for fluid only, since it can handle shards)

'Plane Widget' is now called 'Primitive Widget', can later allow other primitive drawings

Merge branch 'openvdb' into cvdb_ray_isect

Merge branch 'master' into openvdb

Conflicts:
intern/cycles/util/CMakeLists.txt

Cleanup: Style

Cleanup: Unused headers

fix for material loading in FM external mode and generally decreased file loading times, especially noticeable with large FM objects, by using sorted fd->datamap in readfile.c (avoids linear search)

Avoid relative includes