Blender Git Commits

Change library order

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
build_files/cmake/macros.cmake

Merge branch 'blender2.8' into userpref_redesign

UI: Move brush type to appearance panel

This option is not used all the time and putting in the main panel, near of the brush selector, can be weird for the user.

Merge branch 'blender2.8' into asset-engine

Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/WM_types.h

more changes for decoupled fluid cache

liquid support finished, smoke and stability todo

Fix T53478, T53430: Sequencer cut edge case fails

Previous fix for T53430 caused T54200.

The edge case for soft & hard cuts weren't working,
where the strip used start/end-still & the frame was placed exactly on
the start/end of of the sequence content.

T54200 fixed the end-still case but broke hard-cuts for all other cases.

This fixes the case for soft/hard cuts with/without start/end-still.

Revert "Fix T53430: Cut at the strip end fails w/ endstill"

This reverts commit 855799ecc1c5e53d9fbfe520fd5402bc0138f674.

Caused T54200

Error passing context arg to marker menu

own mistake in 6981861fcfd

API generating script: give better version for releases builds.

Was giving '2.62.1 <sha1>' even for releases, now rather giving nicer
'2.62a <sha1>' in that case.

Fix T54206: bevel and inset operations repeat did not remember offset.

Now repeating the operator will use the previously chosen offset, either with
the modal operator or typed in. The modal operator will still start at zero.

Fix T54204: Wrong selection on Clean Tracks (Motion Tracking)

A mistake in a fix for T53612.

Regression in 2.79a, candidate for 2.79b :S

Fix T54003: Particles - Size and random size not present in "physics" tab in Advanced mode

The check to see if `use_advanced_hair` was enabled was actually in two places
(render panel `draw` function and physics panel `poll` function). As these
properties are only in one place now the check in `draw` isn't needed anymore.

Related: T53513, a6c69ca57f661a8538

Bl;ender 2.79b: Begin 2.79b release cycle

Merge branch 'blender2.8' into temp-object-multi-mode

Merge branch 'blender2.8' into temp-object-multi-mode

Revert "Cycles: Removed scaling from Embree's object motion blur."

This reverts commit 3194e05d3f27124924f81b70400fb45fe022d9e4.

Cleanup: use MEM_SAFE_FREE

Merge branch 'blender2.8' into greasepencil-object

Do not draw fill control lines in multiwindow

If enable the fill control lines, these must be drawn only in the current window.