Blender Git Loki

Revert "Audaspace 1.3 experimental-build seventh try"

This reverts commit f10473ee23416768dbc2d234a2ac3ab347ce9c0d.

Audaspace 1.3 experimental-build seventh try

Revert "Audaspace 1.3 experimental-build sixth try"

This reverts commit 75035bd5df0d0868b321414e09f8ee4b1d820700.

Audaspace 1.3 experimental-build sixth try

Revert "Audaspace 1.3 experimental-build fifth try"

This reverts commit 5e64182c66380ba242b024bf5e59f0243491de68.

Audaspace 1.3 experimental-build fifth try

added options for fluid guiding

Collision settings are now effector settings. In there an object can be of type collision or guiding.

Revert "Audaspace 1.3 experimental-build fourth try"

This reverts commit a1a193f07bd1a2b0c0a40ae796fad85a423bc510.

Audaspace 1.3 experimental-build fourth try

Merge branch 'master' into experimental-build

Fix error checking edit mode button in VFX

Merge branch 'blender2.8' into greasepencil-object

New VFX pixelate modifier

fixes for centroid and volume calculation for non-manifolds, fix attempt for storage of merge info

Added first triangulation to generate the fillets. Still needs ring order and assignment though.

Fix T46329: scene_update_{pre,post} doc needs clarification

The documentation for the bpy.app.handlers.scene_update_{pre,post}
handlers states that they're called "on updating the scenes data".
However, they're called even when the data hasn't changed. Of course
such handlers are useful, but the documentation should reflect the
current behaviour.

Reviewers: mont29, sergey

Subscribers: Blendify

Maniphest Tasks: T46329

Differential Revision: https://developer.blender.org/D1535

Fixed Alembic unit test

Commit b6d7cdd3cee9312156e20783248a3b12420b7a53 changed how the mesh data
is deformed, which wasn't taken into account yet in this unit test.

Instead of directly reading the mesh vertices (which aren't animated any
more), we convert the modified mesh to a new one, and inspect those
vertices instead.

Fix T52240: Alembic Not Transferring Materials Per Frame

When a mesh changes its number of vertices during the animation,
Blender rebuilds the DerivedMesh, after which the materials weren't
applied any more (causing the default to the first material slot).

Alembic: Renamed variable assigned_name ? assigned_mat

The variable is a pointer to a Material, not to a name/string.

Fix OSX duplicate path in Python's sys.path

The '..' in the path caused simple comparisons to fail.

D2780 by @akitula