[Bf-blender-cvs] [152bd43ae17] geometry-nodes: Merge branch 'master' into geometry-nodes

[Jacques Lucke]

Commit: 152bd43ae17bbdd5484c8d34915c53c9363ca4d4
Author: Jacques Lucke
Date:   Mon Nov 2 11:44:46 2020 +0100
Branches: geometry-nodes
https://developer.blender.org/rB152bd43ae17bbdd5484c8d34915c53c9363ca4d4

Merge branch 'master' into geometry-nodes

===================================================================



===================================================================

diff --cc source/blender/blenloader/intern/readfile.c
index 32056d03509,5d63456cfab..004b0664fd3
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -156,8 -156,8 +156,7 @@@
  #include "BKE_report.h"
  #include "BKE_scene.h"
  #include "BKE_screen.h"
- #include "BKE_sequencer.h"
  #include "BKE_shader_fx.h"
 -#include "BKE_simulation.h"
  #include "BKE_sound.h"
  #include "BKE_volume.h"
  #include "BKE_workspace.h"