[Bf-blender-cvs] [9cb9a69dcd0] greasepencil-refactor: Merge branch 'greasepencil-object' into greasepencil-refactor

[Antonio Vazquez]

Commit: 9cb9a69dcd07347f0f558b554591505fae2dfcb8
Author: Antonio Vazquez
Date:   Mon Feb 10 15:46:04 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB9cb9a69dcd07347f0f558b554591505fae2dfcb8

Merge branch 'greasepencil-object' into greasepencil-refactor

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 3eb0479ca06,fb475b3e0b1..36993d95dc9
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -74,10 -73,9 +74,10 @@@
  #include "BKE_freestyle.h"
  #include "BKE_global.h"
  #include "BKE_gpencil.h"
 +#include "BKE_gpencil_modifier.h"
  #include "BKE_idprop.h"
  #include "BKE_key.h"
- #include "BKE_library.h"
+ #include "BKE_lib_id.h"
  #include "BKE_layer.h"
  #include "BKE_main.h"
  #include "BKE_mesh.h"
diff --cc source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
index 5873a5cd65f,c2222bfcbce..f7ab7351748
--- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
@@@ -43,9 -43,8 +43,9 @@@
  #include "BKE_curve.h"
  #include "BKE_global.h"
  #include "BKE_idprop.h"
 +#include "BKE_gpencil.h"
  #include "BKE_layer.h"
- #include "BKE_library.h"
+ #include "BKE_lib_id.h"
  #include "BKE_scene.h"
  
  #include "DEG_depsgraph.h"