Blender Git Loki

Fix manipulator update event define using already used value

Quite old issue even, since 97bb7d0a5ba1cb.

Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenloader/intern/writefile.c

Merge branch 'master' into soc-2016-multiview

Merge branch 'master' into temp_localview_split

hooked up blender kernel code to work with obstacle adaptions in liquid script

Quiet compiler warning

Merge branch 'master' into soc-2016-layer_manager

Merge branch 'master' into temp_manipulators_core

Merge branch 'master' into wiggly-widgets

adapted manta liquid script to support obstacles

cleanup for quick liquid script

boundary width != 0 needed for liquid obstacles

refactored liquid inflow function

Merge branch 'master' into asset-engine

Claude: forgot to 'backport' this to actual git repo...

Revert "Squashed commit of asset-engine branch."

This reverts commit de7b1425c9fb08651833dd61b49f1af2a66f7a83.

Squashed commit of asset-engine branch.

Merge branch 'master' into experimental-build

Claude: Add previews handling.

Using PIL right now to load thumbnails, so won't work with 'stock' blender builds :/

Merge branch 'master' into asset-engine