[Bf-blender-cvs] [03a589125f9] blender2.8: Merge branch 'master' into blender2.8

[Sergey Sharybin]

Commit: 03a589125f95fe4a8e8b2bb915453e6b0a2446bb
Author: Sergey Sharybin
Date:   Wed Dec 20 16:46:28 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB03a589125f95fe4a8e8b2bb915453e6b0a2446bb

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/depsgraph/intern/nodes/deg_node.cc
index 8a9eb0b1169,e163e88e0ed..9caa7352587
--- a/source/blender/depsgraph/intern/nodes/deg_node.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node.cc
@@@ -31,23 -31,9 +31,10 @@@
  #include "intern/nodes/deg_node.h"
  
  #include <stdio.h>
- #include <cstring>  /* required for STREQ later on. */
  
  #include "BLI_utildefines.h"
- #include "BLI_ghash.h"
- 
- extern "C" {
- #include "DNA_ID.h"
- #include "DNA_anim_types.h"
- #include "DNA_object_types.h"
- 
- #include "BKE_animsys.h"
- #include "BKE_library.h"
- }
- 
- #include "DEG_depsgraph.h"
  
 +#include "intern/eval/deg_eval_copy_on_write.h"
  #include "intern/nodes/deg_node_component.h"
  #include "intern/nodes/deg_node_id.h"
  #include "intern/nodes/deg_node_operation.h"
diff --cc source/blender/depsgraph/intern/nodes/deg_node_id.cc
index 572b421bdee,478cc2863b0..edc5c0114f9
--- a/source/blender/depsgraph/intern/nodes/deg_node_id.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node_id.cc
@@@ -41,14 -41,8 +41,12 @@@ extern "C" 
  #include "DNA_anim_types.h"
  
  #include "BKE_animsys.h"
 +#include "BKE_library.h"
  }
  
 +#include "DEG_depsgraph.h"
 +
 +#include "intern/eval/deg_eval_copy_on_write.h"
- #include "intern/nodes/deg_node_component.h"
- #include "intern/nodes/deg_node_operation.h"
  #include "intern/nodes/deg_node_time.h"
  #include "intern/depsgraph_intern.h"