Blender Git Loki

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

Merge branch 'missing-libs' into id-remap

Merge branch 'master' into id-remap

Some cleanup & tweaks.

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

Merge branch 'master' into missing-libs

Some cleanup & tweaks.

Relocate library: first working code.

Basics seem to be working, proving idea is valid. There is much to do yet though,
handling correctly all possible scenarii (especially those including indirect libs
used by several libraries, or libs used both directly and indirectly, etc.)
is not going to be a piece of cake...

word wrap and vert-align support for sequencer text

Merge branch 'master' into temp-blf-wordwrap

Initial work to perform volume ray intersection next to the bvh intersection

Support multi-line note stamp

Move color conversion out of blf_font_draw_buffer

So drawing each line doesn't need to re-convert colors.

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

Serious rework (again) of append/link code, to make it more generic.

Making the code in WM area more generic (will be used by relocate libs feature too in future).
And multi-append/link shall no more close & re-open lib files for each and every idcode!

Also, serious cleanup of BLO_append_... API (renamed BLO_link_..., since it links and never appends!),
main real changes there are removing the bContext arg in favor of scene/v3d (a bit more verbose, but does
not requires a valid context anymore to be able to instanciate ob/groups!). And logic behind instanciating
or not has been simplified, previous code was really obscure and sometimes redondant, from quick tests
it still works as expected.

This is temp branch for until 2.76 is over, shall be merged in master asap then.

rename blf_font_buffer -> blf_font_draw_buffer

Add support for line wrapping bitmap buffers

Fix error drawing trailing newline

Merge branch 'master' into id-remap

added non-openmp mantaflow pp files