Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Depsgraph: Remove old depsgraph header from alembic files

Browse Source
This commit is contained in:
Sergey Sharybin
2017-04-06 15:45:47 +02:00
parent ae33f78229
commit 2613ad64c5
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/alembic/CMakeLists.txt
View File

@@ -29,6 +29,7 @@ set(INC
../blenlib ../blenlib
../blenloader ../blenloader
../bmesh ../bmesh
../depsgraph
../editors/include ../editors/include
../makesdna ../makesdna
../makesrna ../makesrna

1
source/blender/alembic/intern/abc_mesh.cc
View File

@@ -38,7 +38,6 @@ extern "C" {
#include "BLI_string.h" #include "BLI_string.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_depsgraph.h"
#include "BKE_main.h" #include "BKE_main.h"
#include "BKE_material.h" #include "BKE_material.h"
#include "BKE_mesh.h" #include "BKE_mesh.h"

1
source/blender/alembic/intern/abc_object.cc
View File

@@ -32,7 +32,6 @@ extern "C" {
#include "DNA_space_types.h" /* for FILE_MAX */ #include "DNA_space_types.h" /* for FILE_MAX */
#include "BKE_constraint.h" #include "BKE_constraint.h"
#include "BKE_depsgraph.h"
#include "BKE_idprop.h" #include "BKE_idprop.h"
#include "BKE_library.h" #include "BKE_library.h"
#include "BKE_modifier.h" #include "BKE_modifier.h"

8
source/blender/alembic/intern/alembic_capi.cc
View File

@@ -47,12 +47,14 @@ extern "C" {
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_context.h" #include "BKE_context.h"
#include "BKE_curve.h" #include "BKE_curve.h"
#include "BKE_depsgraph.h"
#include "BKE_global.h" #include "BKE_global.h"
#include "BKE_library.h" #include "BKE_library.h"
#include "BKE_main.h" #include "BKE_main.h"
#include "BKE_scene.h" #include "BKE_scene.h"
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_build.h"
/* SpaceType struct has a member called 'new' which obviously conflicts with C++ /* SpaceType struct has a member called 'new' which obviously conflicts with C++
* so temporarily redefining the new keyword to make it compile. */ * so temporarily redefining the new keyword to make it compile. */
#define new extern_new #define new extern_new
@@ -744,10 +746,10 @@ static void import_endjob(void *user_data)
BKE_scene_base_add(data->scene, ob); BKE_scene_base_add(data->scene, ob);
DAG_id_tag_update_ex(data->bmain, &ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); DEG_id_tag_update_ex(data->bmain, &ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
} }
DAG_relations_tag_update(data->bmain); DEG_relations_tag_update(data->bmain);
} }
for (iter = data->readers.begin(); iter != data->readers.end(); ++iter) { for (iter = data->readers.begin(); iter != data->readers.end(); ++iter) {