Blender Git Loki

Fix T78266: Mantaflow: changing flow type (fire -> fire + smoke) resets Surface Emission

Changing the surface distance through the flow type is inappropriate here. It had been added to ensure that liquids / smoke use a different emission value.

Now the value will only be changed when changing from a gas to a liquid emitter or, vice-versa, when changing from a liquid to a gas emitter.

Merge branch 'blender-v2.90-release'

Fix parameters in bpy.props.StringProperty Python API docs

There is a parameter typo in Python API document about bpy.props.StringProperty.
This patch fixes this.

Also this patch should apply to 2.90 branch as well.

Reviewed By: Grische, mont29

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

Merge branch 'master' into lanpr-under-gp

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-edit-curve

GPencil: Fix error in SVG clipping camera

GPencil: Export SVG using size of the boundbox if not using camera

Merge branch 'blender-v2.90-release'

Fix T78575: Assert when using UILayout.prop_tabs_enum

Code required the tabs to be placed in an aligned region. Code should
work fine even for unaligned regions though, so I don't see a reason to
forbid this.

Move log definition

silence compiler warning

Add missing debug flag after merge

Merge branch 'master' into soc-2020-info-editor

# Conflicts:
# source/blender/blenkernel/BKE_global.h

Convert printf to clog

Install_deps: add libgmp as default dependency.

This is a common system library, no need for fancy building this time...

Part of D8384.

Convert printf to clog

Remove custom macro as verbosity can be finely controlled using logger

Convert printf to clog

Merge branch 'blender-v2.90-release'

Building: Add ceres to Ninja's heavy jobs pool.

Some files in this library require more than 1.5Gb to build, so they
also belong to the 'heavy' pool.

Merge branch 'blender-v2.90-release' into master