griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Sergey Sharybin
2017-12-20 16:46:28 +01:00
parent 9eb46fc22b e5b92cd63e
commit 03a589125f
2 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/depsgraph/intern/nodes/deg_node.cc
View File

@@ -31,21 +31,8 @@
#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"

2
source/blender/depsgraph/intern/nodes/deg_node_id.cc
View 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"