Blender Git Loki

Merge branch 'blender2.8' into greasepencil-object

Merge branch 'blender2.8' into greasepencil-object

Refactor to reduce number of textures and framebuffers used

Fix memory error for duplicated objects when exit

When duplicate an object, the batch cache was pointing to the original address and when close Blender, the pointer was invalid.

Merge branch 'blender2.8' into greasepencil-object

Revert antialiasing commit

The antialiasing was not working because the final image in default framebuffer is not used to calculate the AA pixels, so this double antialiasing was only adding drawing time.

We need to find a way to mix the grease pencil with the current default framebuffer with antialiasing.

Cleanup: Remove unused code

Merge branch 'blender2.8' into greasepencil-object

Set cursor when change object mode

Cleanup workspace code and replace by change cursor function.

UI: Fix object mode after merge

Add bContext to function

This parameter is required for grease pencil modifiers

Maybe need more work to remove the bContext, but we need it now to compile.

Try to fix the merge problems.

Warning: Now this source code does not compile

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_modes.c
source/blender/makesrna/intern/rna_brush.c

New Line Primitive

The straight lines could be done using Alt key while drawing, but it's better to have a simple primitive.

This has been requested by artists.

Add antialiasing when mix with default buffer on viewport

Still pending antialiasing if there are objects when render.

Merge branch 'blender2.8' into greasepencil-object

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/gpu/GPU_shader.h

Fix render after merge

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/render/intern/source/external_engine.c

Remove aspect ratio from VFX Blur on y-axis

The aspect ratio was not required here because deform the image.