Blender Git Loki

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 'blender2.8' into asset-engine

Conflicts:
source/blender/makesrna/intern/rna_ID.c

Merge branch 'greasepencil-object' into GP-DepthOfField

Merge branch 'blender2.8' into greasepencil-object

WIP: Fix alpha channel and replace by weights

Still there is a problem with the external border.

Thanks Clément for the help.

Refactor Collada: reorganized the BC classes for easier use

* Made many changes to make the usage of the BCAnimationSampler
much easier.

* Reorganized the header files
* renamed methods for better reading
* Added Matrix typedef to replace float mat[4][4]
* simplifdied the construction of BCSampleData entries
* Added BCCamera BCLamp and BCMaterial classes
* Added support for Camera xfov export
* Added supprot for easier FCurve modifications
through the BCAnimationCurve API
* Added comments
* Removed unnecessary code
* Simplified code wherever possible

WIP: More work on shaders and framebuffers for DOF

Still there are problems with the alpha factor and all the scene is empty because alpha is always 0.

cleanup Collada: renamed method, removed not needed method

* renamed get_matrices() to get_samples()
Because the returned list no longer contains a set of matrices

* removed is_flat() test method on BCSamples becasue it actually makes
no sense here.

Remove texture Free for DOF

These textures are freed by draw manager and don't need explicit free.

Fix wrong function to assign texture to shader

WIP: Start to add DOF support

Still is not working. Save this commit as reference.

Merge branch 'master' of git.blender.org:blender into collada

Merge branch 'blender2.8' into greasepencil-object

Cleanup comments

Cleanup shader code

Fix alpha double blend

The color when used alpha factor always got darker. The problem was a double blend that produced a reduction in the color saturation.

Now, there is a premult of the alpha factor before doing last blend pass.

As a result of this change, now the drawing process can be simplified and a pass can be removed. Some cleanup done too.

Still need more work in render mode. Maybe the problem in render is related to Tonemapping.

Thanks Clément Foucault for his help solving this issue.

Merge branch 'blender2.8' into greasepencil-object

just cleanup and minor bug fixes

Merge branch 'blender2.8' into greasepencil-object