Blender Git Loki

Fix compile issues after merging

Merge branch 'blender2.8' into custom-manipulators

Conflicts:
source/blender/editors/interface/resources.c
source/blender/editors/space_node/drawnode.c
source/blender/makesrna/intern/rna_wm.c

added some random rotation for fast bisect, to reduce parallel cuts

support for keeping edge data in fracture modifier (like sharp edges)

Implement angular plasticity (has issues)

Same issues as the previous structural plasticity commit.

Implement structural plasticity (has issues)

The issue here is that the rest length factor isn't cached, because the
cache only allows you to store a single type of data per cache (I'll try
to fix this later), so if you interrupt the simulation midway through,
going to the start frame, the plastic deformations will be reset.

Merge branch 'master' into cycles_split_kernel

Merge branch 'blender2.8' into transform-manipulators

inter-objects constraint objects can now determine which shards (closest) will be connected to the other object

Fixed some typos, and missing initializations

Removed loading thumbs from file, drawing with template_icon_view

Revert "Removed now-unused code of old poselib-previews addon."

This reverts commit 94527ed77c65bda18915216121c7c27cd5b9d2a1.

Merge branch 'multi_previews_id' into temp-sybren-poselib

Added rendering of previews of single poses

FIx merge issues, move preview resolution setting from RNA to BKE, do not clear preview when setting same resolution as current one.

Merge branch 'master' into multi_previews_id

Conflicts:
source/blender/editors/interface/interface_widgets.c

Documented an assumption of the code in a comment.

Don't reset preview index to 0.

Use window manager progress reporting while rendering previews.

Register UNDO step after preview rendering.