Blender Git Loki

Fix crash when trying to use new preview system from py in addon's registration at startup.

Now call UI_init() before py stuff!

fix: crash when using fractal boolean with 1 shard and split shards and other misbehavior (boolean did not create valid rigidbodies, so objects were stuck in the air with 1 shard and fast bisect / fast bisect fill created 1 shard too much everytime)

Merge branch 'master' into ui-preview-buttons

Revert "Squashed commit of asset-experiments branch."

This reverts commit 72927e8a711f48e5526a23af6da9dd41c1b3f20c.

Squashed commit of asset-experiments branch.

Merge branch 'master' into experimental-build

Merge branch 'asset-experiments' into asset-engine

Avoid crashes in pie menus now that strand edit mode forces us to have
more than 8 object modes. We will have to support auto pie expansion at
some point...

Fix win build...

Merge branch 'master' into asset-experiments

Cycles kernel split: Indentation fixes in new kernel files

Cycles kernel split: Don't add extra argument to emissive eval in non-split kernel

This argument does not have chance to be optimized out and it also causes ptex
to crash on sm_30 experimental kernel/

Merge branch 'alembic' into gooseberry

Conflicts:
source/blender/physics/intern/implicit_blender.c

Fix for NaN error when using zero-length springs in the mass-spring
solver.

This happens when using goal springs, which are now defined as linear
springs between actual vertices and virtual goal vertices. The Jacobian
was not accounting for the possibility of zero rest length.

Cycles kernel split: Get rid of redundant _KERNEL_SPLIT suffix of kernels

Cleanup: warnings

Merge branch 'alembic' into gooseberry

Cleanup: quiet warnings

Merge branch 'master' into cycles_kernel_split

Cycles kernel split: Remove unwanted whitespace changes