Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 20 Dec 2017 15:46:28 +0000 (16:46 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 20 Dec 2017 15:46:28 +0000 (16:46 +0100)
source/blender/depsgraph/intern/nodes/deg_node.cc
source/blender/depsgraph/intern/nodes/deg_node_id.cc

index 8a9eb0b11690376c1762f033392c03dbfbc47bb4..9caa7352587c24d626082f5d338dbe11bbae8c59 100644 (file)
 #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"
index 572b421bdeed3a217a8c6241449bea4a03a81ddd..edc5c0114f9a636ead0bcbc2e8ba344f85288565 100644 (file)
@@ -47,8 +47,6 @@ extern "C" {
 #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"