[Bf-blender-cvs] [7bd56f2] render-layers: Merge remote-tracking branch 'origin/blender2.8' into render-layers

[Dalai Felinto]

Commit: 7bd56f207d3008bbbdbd30fff0cdea7e030a17a4
Author: Dalai Felinto
Date:   Wed Jan 4 18:27:14 2017 +0100
Branches: render-layers
https://developer.blender.org/rB7bd56f207d3008bbbdbd30fff0cdea7e030a17a4

Merge remote-tracking branch 'origin/blender2.8' into render-layers

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



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

diff --cc source/blender/blenkernel/CMakeLists.txt
index 6bb0a8f,157c440..fcdaa33
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -148,10 -148,14 +149,15 @@@ set(SR
  	intern/outliner_treehash.c
  	intern/packedFile.c
  	intern/paint.c
+ 	intern/particle.c
+ 	intern/particle_child.c
+ 	intern/particle_distribute.c
+ 	intern/particle_system.c
  	intern/pbvh.c
  	intern/pbvh_bmesh.c
+ 	intern/pointcache.c
  	intern/property.c
 +	intern/layer.c
  	intern/report.c
  	intern/rigidbody.c
  	intern/sca.c
@@@ -264,9 -268,10 +271,11 @@@
  	BKE_outliner_treehash.h
  	BKE_packedFile.h
  	BKE_paint.h
+ 	BKE_particle.h
  	BKE_pbvh.h
+ 	BKE_pointcache.h
  	BKE_property.h
 +	BKE_layer.h
  	BKE_report.h
  	BKE_rigidbody.h
  	BKE_sca.h
diff --cc source/blender/blenloader/intern/readfile.c
index d2288e2,0e1861a..5a82d01
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -8056,9 -8385,9 +8457,10 @@@ static void do_versions(FileData *fd, L
  
  static void do_versions_after_linking(Main *main)
  {
+ 	UNUSED_VARS(main);
  //	printf("%s for %s (%s), %d.%d\n", __func__, main->curlib ? main->curlib->name : main->name,
  //	       main->curlib ? "LIB" : "MAIN", main->versionfile, main->subversionfile);
 +	blo_do_versions_after_linking_280(main);
  }
  
  static void lib_link_all(FileData *fd, Main *main)
diff --cc source/blender/makesrna/intern/rna_scene.c
index 3fe3967,ddfb5dc..4a4570b
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@@ -29,9 -29,9 +29,10 @@@
  #include "DNA_brush_types.h"
  #include "DNA_group_types.h"
  #include "DNA_modifier_types.h"
+ #include "DNA_particle_types.h"
  #include "DNA_rigidbody_types.h"
  #include "DNA_scene_types.h"
 +#include "DNA_layer_types.h"
  #include "DNA_linestyle_types.h"
  #include "DNA_userdef_types.h"
  #include "DNA_world_types.h"
@@@ -423,9 -422,9 +424,10 @@@ EnumPropertyItem rna_enum_bake_pass_fil
  #include "BKE_context.h"
  #include "BKE_global.h"
  #include "BKE_image.h"
 +#include "BKE_layer.h"
  #include "BKE_main.h"
  #include "BKE_node.h"
+ #include "BKE_pointcache.h"
  #include "BKE_scene.h"
  #include "BKE_depsgraph.h"
  #include "BKE_mesh.h"