Blender Git Loki

Merge branch 'master' into asset-experiments

Merge branch 'alembic' into gooseberry

Conflicts:
source/blender/physics/intern/BPH_mass_spring.cpp

Revert "Disabled the goal spring that is supposed to stabilize roots."

This reverts commit 1b32ac9779c709918c3bf9d46e9e4bb1892dd8bc.

The goal spring is not working as intended, but is better than having
no bending force at the roots at all. Needs a better solution (virtual
root vertex).

Fix for incorrect sub-stepping in the strands hair sim solver.

The code was copied from the old cloth solver, which used a while loop.
Ended up using double step increments, which screwed up some
calculations ...

Merge branch 'master' into depsgraph_refactor

Fix for initialization of effector velocities.

Disabled the goal spring that is supposed to stabilize roots.

There are larger bugs still roaming free which need to be solved first.
Goal springs also are inherently unstable because the solver can not
properly estimate their Jacobian.

Use stubs for glrecti/glrectf to make sure the matrix stacks have been
committed.

Merge branch 'master' into temp_viewport_fx_merge

Depsgraph: Make source closer to master

There were some unwanted changes, probably caused by not really correct
merge conflict resolving.

And also reverted whole bunch of changes related on global enabling of
C++11 with MINGW. We don't use C++11 by default now, so Blender should
still be compilable.

Merge branch 'asset-experiments' into asset-engine

Merge branch 'master' into asset-experiments

Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenkernel/BKE_icons.h
source/blender/blenkernel/intern/icons.c
source/blender/editors/include/UI_interface_icons.h
source/blender/editors/interface/interface_icons.c
source/blender/makesrna/intern/rna_ID.c

Merge branch 'master' into depsgraph_refactor

Revert "Depsgraph: Rename SPaceType->new to SpaceType->alloc"

Use alternative and less intrusive approach for dealing with
"new" keyword.

This reverts commit c13455e3328c60fae2deecd7a9d8f0d827715f32.

Merge branch 'master' into ui-preview-buttons

Remove keyword arg use

This API isn't directly accessed, keywords were never used.

add back force reload arg

Merge branch 'master' into ui-preview-buttons

match master