Blender Git Commits

Merge branch 'blender2.8' into greasepencil-object

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

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.

Cleanup: Move all Shader creation to engine_init

Merge branch 'blender2.8' into greasepencil-object

Fix blur shift when add more samples

The image was moved to top when increase the sample number. This was due the shader was bluring both axis at the same time.

Cleanup: Use always even numbers for samples

Cleanup: Simplify shader parameters

Restructure VFX Blur, add Samples and cleanup

Now, the number of defined passes is low and there is a new parameter to define number of samples.

Merge branch 'blender2.8' into greasepencil-object

Cleanup unused variable

Replace constant bokeh value by parameter

Fix compilation error after merge

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/gpu/GPU_shader.h

Fix DOF render segment fault and use Eevee UI options

To activate the DOF for grease pencil, the Eevee option is used as main flag.

Merge branch 'greasepencil-object' into GP-DepthOfField

Merge branch 'blender2.8' into greasepencil-object