Blender Git Commits

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/editors/gpencil/gpencil_data.c
source/blender/editors/gpencil/gpencil_paint.c

Refactor VFX code

Make code more consistent and clear to understand.

Merge branch 'blender2.8' into asset-engine

Conflicts:
source/blender/windowmanager/intern/wm_init_exit.c

Undo support for multi edit-mode

Merge branch '28' into temp-object-multi-mode

Allow zero samples for VFX Blur

When the number of samples is set to zero, the blur is dissabled, but this can be used to get effects animating the samples parameter.

If the zero is not a valid value, it is impossible to disable the blur with only this parameter.

Fix reproject error drawing lines

The reproject was done two times and must be done only once.

Cleanup redundant variable

Fix errors after merge

fix smoke / manta rename in quick effects

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/editors/space_outliner/outliner_select.c

fix smoke / manta rename in UI

replaced WITH_SMOKE macro with WITH_MANTA in entire project

for a mantaflow build, one now only has to enable the WITH_MANTA macro

clean up and fixed some warnings

fixes broken linux build

minor stability improvements for new adaptive inflow setup

Cleanup: Make code more compact

Recover line deleted by mistake in previous commit

Still there is a problem when the undo change to a non GP object.

Fix error after merge

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/editors/gpencil/gpencil_data.c
source/blender/editors/gpencil/gpencil_edit.c
source/blender/editors/util/undo.c

Fix color names for monkey

The colors were missing after save and load again.