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

[Antonio Vazquez]

Commit: 1c6a39c9249f4ee496d9b8fc7f428d637dcbcb27
Author: Antonio Vazquez
Date:   Fri May 25 15:53:00 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB1c6a39c9249f4ee496d9b8fc7f428d637dcbcb27

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/blenkernel/intern/library_query.c
index 12cb704f03b,37b5b62b06e..fac3c5ad3fd
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@@ -1093,9 -1082,8 +1096,10 @@@ bool BKE_library_id_can_use_idtype(ID *
  			return (ELEM(id_type_used, ID_TE, ID_OB));
  		case ID_LP:
  			return ELEM(id_type_used, ID_IM);
 +		case ID_GD:
 +			return ELEM(id_type_used, ID_MA);
  		case ID_WS:
+ 			return ELEM(id_type_used, ID_SCR, ID_SCE);
  		case ID_IM:
  		case ID_VF:
  		case ID_TXT:
diff --cc source/blender/blenkernel/intern/object.c
index 1c875da4883,39e190631ff..0549fb1efe0
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@@ -116,9 -116,9 +116,10 @@@
  #include "BKE_material.h"
  #include "BKE_camera.h"
  #include "BKE_image.h"
 +#include "BKE_gpencil.h"
  
  #include "DEG_depsgraph.h"
+ #include "DEG_depsgraph_query.h"
  
  #include "DRW_engine.h"