Blender Git Loki

Removing XXX MV: render_result_rescale is only called by view3d rendering, so it is fine to rescale only one rect

Remove dead code (rna_Node_image_view_update)

Fix for wrong pointer used in the modifier cache copy function.

Multiview: Fix "mixed declarations and code" error

Fixes needed to make it compile again. Remains broken though!

Merge branch 'asset-experiments' into asset-engine

Conflicts:
source/blender/editors/space_file/filelist.c
source/blender/editors/space_file/filelist.h
source/blender/makesrna/intern/rna_internal.h

Notes:
* asset-experiments branch still needs some work (e.g. entires selection is to be reworked too),
but was more than time to do a first merge...
* This is raw merge, code is hence broken and needs more fixes to take into account new changes!

Force calculation function for strands (only gravity atm).

Merge branch 'master' into asset-experiments

FileBrowser: cleanup.

Get rid of cache iterator code (not needed, and don't think we'll need it later,
easy to add back if needed). Also comment some debug prints.

New preview (thumbnails) handling seems to be working pretty nice now.

Removing XXX MV: implement RE_layer_load_from_file() - for one view only

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

FileBrowser: Fix stupid cache clear on each redraw while previews where updating.

Missing 'need filter' flag clearing...

Sanity check and nicer substep loop for strands simulation.

Fixed writing code for cache modifiers to include extra DNA fields of
subtypes.

FileBrowser - fix two crashers.

* Full path is no more static, so we need dynamic tooltips to use it (still an
issue with drag stuff here :| ).
* Remove timer would attempt to free timer's customdata, which is mere int-in-pointer
in case of new notifier timer, so we need a special tweak on remove here.

Fixed DupliCache writers/readers to support subsequent stages of
cache manipulation.

Strand data in caches is now stored in a named list, so we can avoid
adding strand data in every frame.

Merge branch 'master' into gooseberry

Merge branch 'master' into gooseberry

Merge branch 'master' into alembic

cleanup: warning