[Bf-blender-cvs] [945222740f0] lanpr-under-gp: Merge remote-tracking branch 'origin/master' into lanpr-under-gp

[YimingWu]

Commit: 945222740f0362fa138576dac35612635d36edbd
Author: YimingWu
Date:   Fri Oct 2 11:49:48 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB945222740f0362fa138576dac35612635d36edbd

Merge remote-tracking branch 'origin/master' into lanpr-under-gp

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



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

diff --cc source/blender/makesrna/intern/rna_collection.c
index 1a002a5ba50,df1d7abd6b1..5da4337cef4
--- a/source/blender/makesrna/intern/rna_collection.c
+++ b/source/blender/makesrna/intern/rna_collection.c
@@@ -22,13 -22,10 +22,14 @@@
  
  #include "DNA_collection_types.h"
  
 +#include "DNA_lineart_types.h"
 +
  #include "BLI_utildefines.h"
  
 +#include "MEM_guardedalloc.h"
 +
  #include "RNA_define.h"
+ #include "RNA_enum_types.h"
  
  #include "rna_internal.h"
  
diff --cc source/blender/makesrna/intern/rna_scene.c
index e51ff5b13de,8e09de86529..3270de160f1
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@@ -45,9 -44,9 +45,10 @@@
  #include "BKE_armature.h"
  #include "BKE_editmesh.h"
  #include "BKE_paint.h"
+ #include "BKE_volume.h"
  
  #include "ED_gpencil.h"
 +#include "ED_lineart.h"
  #include "ED_object.h"
  
  #include "DRW_engine.h"