diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-06 17:38:43 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-06 17:38:43 +0300 |
commit | ed1ef06199ffbcc7f585491363febf8798d82b66 (patch) | |
tree | a990fd6eb3390a0a3c77e98b90659893c4bb7997 /source/blender/render | |
parent | 2d80f37bcec79621ef8f3a0c6dbf1bd7882e32b6 (diff) |
Depsgraph: Remove old depsgraph header from blender internal
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/convertblender.c | 5 | ||||
-rw-r--r-- | source/blender/render/intern/source/multires_bake.c | 5 | ||||
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 11 |
3 files changed, 12 insertions, 9 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 1d0cc0ec7cf..9d30c3460cc 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -66,7 +66,6 @@ #include "BKE_customdata.h" #include "BKE_colortools.h" #include "BKE_displist.h" -#include "BKE_depsgraph.h" #include "BKE_DerivedMesh.h" #include "BKE_global.h" #include "BKE_key.h" @@ -82,6 +81,8 @@ #include "BKE_particle.h" #include "BKE_scene.h" +#include "DEG_depsgraph.h" + #include "PIL_time.h" #include "envmap.h" @@ -5221,7 +5222,7 @@ void RE_Database_FromScene(Render *re, Main *bmain, Scene *scene, unsigned int l RE_SetView(re, mat); /* force correct matrix for scaled cameras */ - DAG_id_tag_update_ex(re->main, &camera->id, OB_RECALC_OB); + DEG_id_tag_update_ex(re->main, &camera->id, OB_RECALC_OB); } /* store for incremental render, viewmat rotates dbase */ diff --git a/source/blender/render/intern/source/multires_bake.c b/source/blender/render/intern/source/multires_bake.c index fba5836ac32..7eda0efd692 100644 --- a/source/blender/render/intern/source/multires_bake.c +++ b/source/blender/render/intern/source/multires_bake.c @@ -42,7 +42,6 @@ #include "BLI_threads.h" #include "BKE_ccg.h" -#include "BKE_depsgraph.h" #include "BKE_global.h" #include "BKE_image.h" #include "BKE_mesh.h" @@ -50,6 +49,8 @@ #include "BKE_modifier.h" #include "BKE_subsurf.h" +#include "DEG_depsgraph.h" + #include "RE_multires_bake.h" #include "RE_pipeline.h" #include "RE_shader_ext.h" @@ -1283,7 +1284,7 @@ static void finish_images(MultiresBakeRender *bkr, MultiresBakeResult *result) } BKE_image_release_ibuf(ima, ibuf, NULL); - DAG_id_tag_update(&ima->id, 0); + DEG_id_tag_update(&ima->id, 0); } } diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 8c3ead4fa98..93fc2fb7e6e 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -62,7 +62,6 @@ #include "BKE_animsys.h" /* <------ should this be here?, needed for sequencer update */ #include "BKE_camera.h" #include "BKE_colortools.h" -#include "BKE_depsgraph.h" #include "BKE_global.h" #include "BKE_image.h" #include "BKE_library.h" @@ -78,6 +77,8 @@ #include "BKE_writeavi.h" /* <------ should be replaced once with generic movie module */ #include "BKE_object.h" +#include "DEG_depsgraph.h" + #include "PIL_time.h" #include "IMB_colormanagement.h" #include "IMB_imbuf.h" @@ -2039,22 +2040,22 @@ static void tag_dependend_objects_for_render(Scene *scene, int UNUSED(renderlay) if (md->type == eModifierType_Boolean) { BooleanModifierData *bmd = (BooleanModifierData *)md; if (bmd->object && bmd->object->type == OB_MESH) { - DAG_id_tag_update(&bmd->object->id, OB_RECALC_DATA); + DEG_id_tag_update(&bmd->object->id, OB_RECALC_DATA); } } else if (md->type == eModifierType_Array) { ArrayModifierData *amd = (ArrayModifierData *)md; if (amd->start_cap && amd->start_cap->type == OB_MESH) { - DAG_id_tag_update(&amd->start_cap->id, OB_RECALC_DATA); + DEG_id_tag_update(&amd->start_cap->id, OB_RECALC_DATA); } if (amd->end_cap && amd->end_cap->type == OB_MESH) { - DAG_id_tag_update(&amd->end_cap->id, OB_RECALC_DATA); + DEG_id_tag_update(&amd->end_cap->id, OB_RECALC_DATA); } } else if (md->type == eModifierType_Shrinkwrap) { ShrinkwrapModifierData *smd = (ShrinkwrapModifierData *)md; if (smd->target && smd->target->type == OB_MESH) { - DAG_id_tag_update(&smd->target->id, OB_RECALC_DATA); + DEG_id_tag_update(&smd->target->id, OB_RECALC_DATA); } } } |