diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-06 17:34:38 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-06 17:34:38 +0300 |
| commit | 05ffca5c8a4390198a789c4b45b058a2a22693ca (patch) | |
| tree | 28c1842d2dc0fb5c3c2de42339d7dc904b868785 /source/blender/modifiers | |
| parent | 11650273082a5981112007f95c35bfdc1728de69 (diff) | |
Depsgraph: Remove old depsgraph header from modifiers
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_array.c | 1 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_curve.c | 1 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_subsurf.c | 4 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_uvwarp.c | 1 |
4 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 61a5a0de119..78a5631bb94 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -46,7 +46,6 @@ #include "DNA_scene_types.h" #include "BKE_cdderivedmesh.h" -#include "BKE_depsgraph.h" #include "BKE_displist.h" #include "BKE_curve.h" #include "BKE_library_query.h" diff --git a/source/blender/modifiers/intern/MOD_curve.c b/source/blender/modifiers/intern/MOD_curve.c index e71a1591afe..d9acce0a780 100644 --- a/source/blender/modifiers/intern/MOD_curve.c +++ b/source/blender/modifiers/intern/MOD_curve.c @@ -41,7 +41,6 @@ #include "BKE_cdderivedmesh.h" -#include "BKE_depsgraph.h" #include "BKE_lattice.h" #include "BKE_library_query.h" #include "BKE_modifier.h" diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c index 6661ef194f4..bfe8ababf81 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.c +++ b/source/blender/modifiers/intern/MOD_subsurf.c @@ -46,11 +46,11 @@ #include "BKE_cdderivedmesh.h" -#include "BKE_depsgraph.h" #include "BKE_scene.h" #include "BKE_subsurf.h" #include "DEG_depsgraph.h" +#include "DEG_depsgraph_query.h" #include "MOD_modifiertypes.h" @@ -135,7 +135,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, else if ((ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT)) != 0) { modifier_setError(md, "OpenSubdiv is not supported in paint modes"); } - else if ((DAG_get_eval_flags_for_object(md->scene, ob) & DAG_EVAL_NEED_CPU) == 0) { + else if ((DEG_get_eval_flags_for_id(md->scene->depsgraph, &ob->id) & DAG_EVAL_NEED_CPU) == 0) { subsurf_flags |= SUBSURF_USE_GPU_BACKEND; do_cddm_convert = false; } diff --git a/source/blender/modifiers/intern/MOD_uvwarp.c b/source/blender/modifiers/intern/MOD_uvwarp.c index 71a599b745d..7ee0a7e3108 100644 --- a/source/blender/modifiers/intern/MOD_uvwarp.c +++ b/source/blender/modifiers/intern/MOD_uvwarp.c @@ -37,7 +37,6 @@ #include "BKE_action.h" /* BKE_pose_channel_find_name */ #include "BKE_cdderivedmesh.h" #include "BKE_deform.h" -#include "BKE_depsgraph.h" #include "BKE_library_query.h" #include "BKE_modifier.h" |