Merge remote-tracking branch 'origin/blender2.8' into pbr-merge

Conflicts:
	source/blender/blenloader/intern/versioning_defaults.c
	source/blender/editors/space_view3d/drawobject.c
	source/blender/editors/space_view3d/space_view3d.c
	source/blender/editors/space_view3d/view3d_draw.c
	source/blender/gpu/CMakeLists.txt
	source/blender/gpu/GPU_framebuffer.h
	source/blender/gpu/GPU_material.h
	source/blender/gpu/GPU_shader.h
	source/blender/gpu/intern/gpu_codegen.c
	source/blender/gpu/intern/gpu_draw.c
	source/blender/gpu/intern/gpu_framebuffer.c
	source/blender/gpu/intern/gpu_material.c
	source/blender/gpu/intern/gpu_shader.c
	source/blender/makesdna/DNA_view3d_types.h

1 files changed, 0 insertions, 1 deletions

diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h
index a4f5c425282..7eba01e6d5a 100644
--- a/source/blender/blenkernel/BKE_main.h
+++ b/source/blender/blenkernel/BKE_main.h
@@ -96,7 +96,6 @@ typedef struct Main {
 	ListBase action;
 	ListBase nodetree;
 	ListBase brush;
-	ListBase particle;
 	ListBase palettes;
 	ListBase paintcurves;
 	ListBase wm;