Blender Git Loki

Merge branch 'master' into fluid-mantaflow

Mantaflow: Small UI fix

effector_weights function had deprecated arguments

Mantaflow: Implemented adaptive domain for manta smoke

This functionality exists in the vanilla build already but had to be disabled in the manta build. Now it is back.

Mantaflow: Updated UI for domain border behaviour

Options for domain borders are now in a separate panel

Mantaflow: Fix for smoke emission from particles

Mantaflow: Updated manta pp files and added update script

Merge branch 'master' into fluid-mantaflow

Merge 'master' into 'fluid-mantaflow'

Conflicts:
release/scripts/startup/bl_ui/properties_physics_common.py
release/scripts/startup/bl_ui/properties_physics_smoke.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/smoke.c
source/blender/editors/physics/CMakeLists.txt
source/blender/makesdna/DNA_smoke_types.h
source/blender/modifiers/intern/MOD_smoke.c

Merge 'master' into 'fluid-mantaflow'

Merge 'master' into 'fluid-mantaflow'

Conflicts:
build_files/cmake/macros.cmake
intern/smoke/CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/smoke.c
source/blender/draw/engines/eevee/eevee_volumes.c

Mantaflow: Fixes small issue with levelset

Minor change in levelset generation and added sanity check for flowsflags

Merge branch 'smokeTypes' into smokeC

Merge branch 'rnaSmoke' into smokeTypes

Merge branch 'particleSystem' into rnaSmoke

Merge branch 'bakeConfig' into particleSystem

Merge branch 'sourceUpdate' into bakeConfig

Merge branch 'internUpdate' into sourceUpdate

Merge branch 'buildConfig' into internUpdate

Merge branch 'pythonScripts' into buildConfig

Merge branch 'mantaWrapper' into pythonScripts