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

Depsgraph: Remove old depsgraph header from modifiers

Browse Source
This commit is contained in:
Sergey Sharybin
2017-04-06 16:34:38 +02:00
parent 1165027308
commit 05ffca5c8a
4 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/modifiers/intern/MOD_array.c
View File

@@ -46,7 +46,6 @@
#include "DNA_scene_types.h" #include "DNA_scene_types.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_depsgraph.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_curve.h" #include "BKE_curve.h"
#include "BKE_library_query.h" #include "BKE_library_query.h"

1
source/blender/modifiers/intern/MOD_curve.c
View File

@@ -41,7 +41,6 @@
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_depsgraph.h"
#include "BKE_lattice.h" #include "BKE_lattice.h"
#include "BKE_library_query.h" #include "BKE_library_query.h"
#include "BKE_modifier.h" #include "BKE_modifier.h"

4
source/blender/modifiers/intern/MOD_subsurf.c
View File

@@ -46,11 +46,11 @@
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_depsgraph.h"
#include "BKE_scene.h" #include "BKE_scene.h"
#include "BKE_subsurf.h" #include "BKE_subsurf.h"
#include "DEG_depsgraph.h" #include "DEG_depsgraph.h"
#include "DEG_depsgraph_query.h"
#include "MOD_modifiertypes.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) { 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"); 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; subsurf_flags |= SUBSURF_USE_GPU_BACKEND;
do_cddm_convert = false; do_cddm_convert = false;
} }

1
source/blender/modifiers/intern/MOD_uvwarp.c
View File

@@ -37,7 +37,6 @@
#include "BKE_action.h" /* BKE_pose_channel_find_name */ #include "BKE_action.h" /* BKE_pose_channel_find_name */
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_deform.h" #include "BKE_deform.h"
#include "BKE_depsgraph.h"
#include "BKE_library_query.h" #include "BKE_library_query.h"
#include "BKE_modifier.h" #include "BKE_modifier.h"