Blender Git Loki

Cleanup: Removing stuff that was added earlier but is no longer needed

Cleanup: Style

Fix segment fault for modifiers with COW enabled

The curves in copyData was freed, but the pointer was not set to NULL.

Merge branch 'blender2.8' into greasepencil-object

UI: Move "Move to Color" and "Select Strokes" operators from popup menu into the UI proper

This brings the GP materials UI more into line with the standard object materials UI

Cleanup: Remove unused code (was from when we still used palette colors)

Fix: Don't show panels/complain if material doesn't have GP material settings

Cleanup: Remove old cruft

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
release/scripts/startup/bl_ui/properties_scene.py

Merge branch 'blender2.8' into greasepencil-object

Merge branch 'blender2.8' into greasepencil-object

Cleanup: Remove "colorname" from GPStroke.new()

This isn't used now, so remove it to silence the compiler warnings here

Fix compiler warnings after API changes in 2.8

Merge branch 'blender2.8' into greasepencil-object

# Conflicts:
# source/blender/blenloader/intern/versioning_280.c
# source/blender/editors/gpencil/gpencil_edit.c
# source/blender/editors/gpencil/gpencil_paint.c
# source/blender/editors/gpencil/gpencil_utils.c
# source/blender/editors/object/object_transform.c

Remove VFX simplify option

Merge branch 'greasepencil-object' of git.blender.org:blender into greasepencil-object

Conflicts:
source/blender/draw/engines/gpencil/gpencil_engine.c

WIP: Temporary/placeholder commit to get compiling working

Commented out all lines referring to vfx-related passes/buffers.
(Antonio: Please revert this commit, then commit proper fixes for each of these lines)

Remove VFX (more cleanup)

More changes to remove VFX modifiers and DOF.

Removed some unused code not removed in previous commit.

The temp texture A reused by general drawing has been enabled again (removed by error in previous commit) and renamed.

Fixed some lines removed by error in previous commit.

The modifer number in DNA_modifiers_types.h has been realigned to avoid any gap. This could produce some problems importing Hero files. Need check.

More build fixes - Removing more lingering modifier/dof defines

More build fixes for VFX removal

Still not building, but these should also be safe