diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-06 16:45:47 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-06 16:49:56 +0300 |
| commit | 2613ad64c5514cd3d610d3b5a18d0831081fc706 (patch) | |
| tree | f9c1e69f0ef1ec505c58641d62d4203878c0cbd7 /source/blender | |
| parent | ae33f782297697b2618c21a3f6b0cfb2a6fecafc (diff) | |
Depsgraph: Remove old depsgraph header from alembic files
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/alembic/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/alembic/intern/abc_mesh.cc | 1 | ||||
| -rw-r--r-- | source/blender/alembic/intern/abc_object.cc | 1 | ||||
| -rw-r--r-- | source/blender/alembic/intern/alembic_capi.cc | 8 |
4 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/alembic/CMakeLists.txt b/source/blender/alembic/CMakeLists.txt index a6e0be6a7f3..aa12b726d6b 100644 --- a/source/blender/alembic/CMakeLists.txt +++ b/source/blender/alembic/CMakeLists.txt @@ -29,6 +29,7 @@ set(INC ../blenlib ../blenloader ../bmesh + ../depsgraph ../editors/include ../makesdna ../makesrna diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc index 5a57e43326a..63c69cae8cd 100644 --- a/source/blender/alembic/intern/abc_mesh.cc +++ b/source/blender/alembic/intern/abc_mesh.cc @@ -38,7 +38,6 @@ extern "C" { #include "BLI_string.h" #include "BKE_cdderivedmesh.h" -#include "BKE_depsgraph.h" #include "BKE_main.h" #include "BKE_material.h" #include "BKE_mesh.h" diff --git a/source/blender/alembic/intern/abc_object.cc b/source/blender/alembic/intern/abc_object.cc index a0cd378ff95..36873c140ff 100644 --- a/source/blender/alembic/intern/abc_object.cc +++ b/source/blender/alembic/intern/abc_object.cc @@ -32,7 +32,6 @@ extern "C" { #include "DNA_space_types.h" /* for FILE_MAX */ #include "BKE_constraint.h" -#include "BKE_depsgraph.h" #include "BKE_idprop.h" #include "BKE_library.h" #include "BKE_modifier.h" diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc index 91687db4334..b85344be7f5 100644 --- a/source/blender/alembic/intern/alembic_capi.cc +++ b/source/blender/alembic/intern/alembic_capi.cc @@ -47,12 +47,14 @@ extern "C" { #include "BKE_cdderivedmesh.h" #include "BKE_context.h" #include "BKE_curve.h" -#include "BKE_depsgraph.h" #include "BKE_global.h" #include "BKE_library.h" #include "BKE_main.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++ * so temporarily redefining the new keyword to make it compile. */ #define new extern_new @@ -744,10 +746,10 @@ static void import_endjob(void *user_data) 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) { |