Merge remote-tracking branch 'origin/blender2.8' into render-layers
authorDalai Felinto <dfelinto@gmail.com>
Wed, 4 Jan 2017 17:27:14 +0000 (18:27 +0100)
committerDalai Felinto <dfelinto@gmail.com>
Wed, 4 Jan 2017 17:27:14 +0000 (18:27 +0100)
16 files changed:
1  2 
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_context.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/context.c
source/blender/blenkernel/intern/library_query.c
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_relations.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_context.c
source/blender/makesrna/intern/rna_scene.c

index 6bb0a8f79ada3a7b0c6ebe07f212cea1d8f6b27d,157c4408d6ac8713ebfe8b9bc959ed499da62e5a..fcdaa33acfc68b3e50b3eb2830cc47fed8b96300
@@@ -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
        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
index d2288e2a200b922f2bd27628431ffee3610591e5,0e1861abcf147f41b182e19f9fb0bb820a761a56..5a82d013de63c6278cdc82137bcc1d617cea70cf
@@@ -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)
Simple merge
index 3fe39677e720e3641b376afc79022958d734919e,ddfb5dc6d611bcc141561aafbaf5acd9319a8495..4a4570b16054cf521b495dffd5b8a39a00307962
  #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"