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

[Antonio Vazquez]

Commit: 40cc91e63089498656eb00efc8ff9a47dd9b53d2
Author: Antonio Vazquez
Date:   Mon Dec 4 15:57:10 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rB40cc91e63089498656eb00efc8ff9a47dd9b53d2

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	source/blender/blenloader/intern/readfile.c

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index 281ff5bc509,6df5a505788..e4c85678872
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -255,9 -254,8 +255,10 @@@ static void direct_link_modifiers(FileD
  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 void expand_scene_collection(FileData *fd, Main *mainvar, SceneCollection *sc);
- static SceneCollection *get_scene_collection_active_or_create(struct Scene *scene, struct ViewLayer *view_layer, const short flag);
+ static SceneCollection *get_scene_collection_active_or_create(
+         struct Scene *scene, struct ViewLayer *view_layer, const int 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!