[Bf-blender-cvs] [e4369b66630] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: e4369b66630bd02e572bcbe5769bfc6087b810ef
Author: Antonio Vazquez
Date:   Tue Oct 24 19:35:12 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBe4369b66630bd02e572bcbe5769bfc6087b810ef

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index f17f2a75b87,ce7914b0f37..434d627afbc
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -253,8 -252,7 +253,9 @@@ static void *read_struct(FileData *fd, 
  static void direct_link_modifiers(FileData *fd, ListBase *lb);
  static BHead *find_bhead_from_code_name(FileData *fd, const short idcode, const char *name);
  static BHead *find_bhead_from_idname(FileData *fd, const char *idname);
+ static SceneCollection *get_scene_collection_active_or_create(struct Scene *scene, struct SceneLayer *sl, const short flag);
 +static void direct_link_animdata(FileData *fd, AnimData *adt);
 +static void lib_link_animdata(FileData *fd, ID *id, AnimData *adt);
  
  /* this function ensures that reports are printed,
   * in the case of libraray linking errors this is important!