diff --git a/source/blender/blenkernel/intern/anim_sys.cc b/source/blender/blenkernel/intern/anim_sys.cc index 9d87d3c1a87..3dc74825494 100644 --- a/source/blender/blenkernel/intern/anim_sys.cc +++ b/source/blender/blenkernel/intern/anim_sys.cc @@ -4190,7 +4190,7 @@ void BKE_animsys_update_driver_array(ID *id) void BKE_animsys_eval_driver_unshare(Depsgraph *depsgraph, ID *id_eval) { - BLI_assert(DEG_is_evaluated_id(id_eval)); + BLI_assert(DEG_is_evaluated(id_eval)); AnimData *adt = BKE_animdata_from_id(id_eval); PointerRNA id_ptr = RNA_id_pointer_create(id_eval); diff --git a/source/blender/blenkernel/intern/camera.cc b/source/blender/blenkernel/intern/camera.cc index d53c99f2d6c..42c8a27eef3 100644 --- a/source/blender/blenkernel/intern/camera.cc +++ b/source/blender/blenkernel/intern/camera.cc @@ -417,7 +417,7 @@ void BKE_camera_params_from_view3d(CameraParams *params, if (rv3d->persp == RV3D_CAMOB) { /* camera view */ - const Object *ob_camera_eval = DEG_get_evaluated_object(depsgraph, v3d->camera); + const Object *ob_camera_eval = DEG_get_evaluated(depsgraph, v3d->camera); BKE_camera_params_from_object(params, ob_camera_eval); params->zoom = BKE_screen_view3d_zoom_to_fac(rv3d->camzoom); @@ -898,7 +898,7 @@ bool BKE_camera_view_frame_fit_to_coords(const Depsgraph *depsgraph, float *r_scale) { Scene *scene_eval = DEG_get_evaluated_scene(depsgraph); - Object *camera_ob_eval = DEG_get_evaluated_object(depsgraph, camera_ob); + Object *camera_ob_eval = DEG_get_evaluated(depsgraph, camera_ob); CameraParams params; CameraViewFrameData data_cb; diff --git a/source/blender/blenkernel/intern/constraint.cc b/source/blender/blenkernel/intern/constraint.cc index ceb5d7ba62a..e2d4c06a5ae 100644 --- a/source/blender/blenkernel/intern/constraint.cc +++ b/source/blender/blenkernel/intern/constraint.cc @@ -5636,7 +5636,7 @@ bool BKE_constraint_apply_for_object(Depsgraph *depsgraph, /* Do this all in the evaluated domain (e.g. shrinkwrap needs to access evaluated constraint * target mesh). */ Scene *scene_eval = DEG_get_evaluated_scene(depsgraph); - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob); bConstraint *con_eval = BKE_constraints_find_name(&ob_eval->constraints, con->name); bConstraint *new_con = BKE_constraint_duplicate_ex(con_eval, 0, ID_IS_EDITABLE(ob)); @@ -5688,7 +5688,7 @@ bool BKE_constraint_apply_for_pose( /* Do this all in the evaluated domain (e.g. shrinkwrap needs to access evaluated constraint * target mesh). */ Scene *scene_eval = DEG_get_evaluated_scene(depsgraph); - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob); bPoseChannel *pchan_eval = BKE_pose_channel_find_name(ob_eval->pose, pchan->name); bConstraint *con_eval = BKE_constraints_find_name(&pchan_eval->constraints, con->name); diff --git a/source/blender/blenkernel/intern/crazyspace.cc b/source/blender/blenkernel/intern/crazyspace.cc index b9b0420499d..a814010c312 100644 --- a/source/blender/blenkernel/intern/crazyspace.cc +++ b/source/blender/blenkernel/intern/crazyspace.cc @@ -92,7 +92,7 @@ blender::Array BKE_crazyspace_get_mapped_editverts(Depsgraph *d Object *obedit) { Scene *scene_eval = DEG_get_evaluated_scene(depsgraph); - Object *obedit_eval = DEG_get_evaluated_object(depsgraph, obedit); + Object *obedit_eval = DEG_get_evaluated(depsgraph, obedit); const int cageIndex = BKE_modifiers_get_cage_index(scene_eval, obedit_eval, nullptr, true); /* Disable subsurf temporal, get mapped cos, and enable it. */ @@ -303,7 +303,7 @@ static void crazyspace_init_object_for_eval(Depsgraph *depsgraph, Object *object, Object *object_crazy) { - Object *object_eval = DEG_get_evaluated_object(depsgraph, object); + Object *object_eval = DEG_get_evaluated(depsgraph, object); *object_crazy = blender::dna::shallow_copy(*object_eval); object_crazy->runtime = MEM_new(__func__, *object_eval->runtime); if (object_crazy->runtime->data_orig != nullptr) { @@ -620,7 +620,7 @@ GeometryDeformation get_evaluated_curves_deformation(const Object *ob_eval, cons GeometryDeformation get_evaluated_curves_deformation(const Depsgraph &depsgraph, const Object &ob_orig) { - const Object *ob_eval = DEG_get_evaluated_object(&depsgraph, &ob_orig); + const Object *ob_eval = DEG_get_evaluated(&depsgraph, &ob_orig); return get_evaluated_curves_deformation(ob_eval, ob_orig); } @@ -706,7 +706,7 @@ GeometryDeformation get_evaluated_grease_pencil_drawing_deformation(const Depsgr const int layer_index, const int frame) { - const Object *ob_eval = DEG_get_evaluated_object(&depsgraph, &ob_orig); + const Object *ob_eval = DEG_get_evaluated(&depsgraph, &ob_orig); return get_evaluated_grease_pencil_drawing_deformation(ob_eval, ob_orig, layer_index, frame); } diff --git a/source/blender/blenkernel/intern/curve_convert.cc b/source/blender/blenkernel/intern/curve_convert.cc index 6b64802ccac..1eec5c1a6f8 100644 --- a/source/blender/blenkernel/intern/curve_convert.cc +++ b/source/blender/blenkernel/intern/curve_convert.cc @@ -24,7 +24,7 @@ static Curve *curve_from_font_object(Object *object, Depsgraph *depsgraph) Curve *curve = (Curve *)object->data; Curve *new_curve = (Curve *)BKE_id_copy_ex(nullptr, &curve->id, nullptr, LIB_ID_COPY_LOCALIZE); - Object *evaluated_object = DEG_get_evaluated_object(depsgraph, object); + Object *evaluated_object = DEG_get_evaluated(depsgraph, object); BKE_vfont_to_curve_nubase(evaluated_object, FO_EDIT, &new_curve->nurb); new_curve->type = OB_CURVES_LEGACY; @@ -37,7 +37,7 @@ static Curve *curve_from_font_object(Object *object, Depsgraph *depsgraph) static Curve *curve_from_curve_object(Object *object, Depsgraph *depsgraph, bool apply_modifiers) { - Object *evaluated_object = DEG_get_evaluated_object(depsgraph, object); + Object *evaluated_object = DEG_get_evaluated(depsgraph, object); Curve *curve = (Curve *)evaluated_object->data; Curve *new_curve = (Curve *)BKE_id_copy_ex(nullptr, &curve->id, nullptr, LIB_ID_COPY_LOCALIZE); diff --git a/source/blender/blenkernel/intern/data_transfer.cc b/source/blender/blenkernel/intern/data_transfer.cc index 40c2508b395..42374baf5a6 100644 --- a/source/blender/blenkernel/intern/data_transfer.cc +++ b/source/blender/blenkernel/intern/data_transfer.cc @@ -1181,7 +1181,7 @@ void BKE_object_data_transfer_layout(Depsgraph *depsgraph, me_dst = static_cast(ob_dst->data); /* Get source evaluated mesh. */ - const Object *ob_src_eval = DEG_get_evaluated_object(depsgraph, ob_src); + const Object *ob_src_eval = DEG_get_evaluated(depsgraph, ob_src); const Mesh *me_src = BKE_object_get_evaluated_mesh(ob_src_eval); if (!me_src) { return; @@ -1378,7 +1378,7 @@ bool BKE_object_data_transfer_ex(Depsgraph *depsgraph, me_src = BKE_modifier_get_evaluated_mesh_from_evaluated_object(ob_src); } else { - const Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob_src); + const Object *ob_eval = DEG_get_evaluated(depsgraph, ob_src); me_src = BKE_object_get_evaluated_mesh(ob_eval); } if (!me_src) { diff --git a/source/blender/blenkernel/intern/editmesh.cc b/source/blender/blenkernel/intern/editmesh.cc index ca30cf740ec..ecf97afd8a5 100644 --- a/source/blender/blenkernel/intern/editmesh.cc +++ b/source/blender/blenkernel/intern/editmesh.cc @@ -185,7 +185,7 @@ Span BKE_editmesh_vert_coords_when_deformed( Depsgraph *depsgraph, BMEditMesh *em, Scene *scene, Object *ob, Array &r_alloc) { - const Object *object_eval = DEG_get_evaluated_object(depsgraph, ob); + const Object *object_eval = DEG_get_evaluated(depsgraph, ob); const Mesh *editmesh_eval_final = BKE_object_get_editmesh_eval_final(object_eval); const Mesh *mesh_cage = BKE_object_get_editmesh_eval_cage(ob); diff --git a/source/blender/blenkernel/intern/grease_pencil.cc b/source/blender/blenkernel/intern/grease_pencil.cc index dc3a65e8db0..549f6e42ea3 100644 --- a/source/blender/blenkernel/intern/grease_pencil.cc +++ b/source/blender/blenkernel/intern/grease_pencil.cc @@ -112,7 +112,7 @@ static void grease_pencil_set_runtime_visibilities(ID &id_dst, GreasePencil &gre { using namespace blender::bke; - if (!DEG_is_evaluated_id(&id_dst) || !grease_pencil.adt) { + if (!DEG_is_evaluated(&id_dst) || !grease_pencil.adt) { return; } diff --git a/source/blender/blenkernel/intern/lib_id.cc b/source/blender/blenkernel/intern/lib_id.cc index b8b0e4e3f18..3169514fdd9 100644 --- a/source/blender/blenkernel/intern/lib_id.cc +++ b/source/blender/blenkernel/intern/lib_id.cc @@ -851,7 +851,7 @@ ID *BKE_id_copy_for_use_in_bmain(Main *bmain, const ID *id) /* Shape keys reference on evaluated ID is preserved to keep driver paths available, but the key * data is likely to be invalid now due to modifiers, so clear the shape key reference avoiding * any possible shape corruption. */ - if (DEG_is_evaluated_id(id)) { + if (DEG_is_evaluated(id)) { Key **key_p = BKE_key_from_id_p(newid); if (key_p) { *key_p = nullptr; diff --git a/source/blender/blenkernel/intern/material.cc b/source/blender/blenkernel/intern/material.cc index 1decbedc17e..63450a17fea 100644 --- a/source/blender/blenkernel/intern/material.cc +++ b/source/blender/blenkernel/intern/material.cc @@ -744,7 +744,7 @@ Material *BKE_object_material_get_eval(Object *ob, short act) const Material *BKE_object_material_get_eval(const Object &ob, const ID &data, const short act) { - BLI_assert(DEG_is_evaluated_object(&ob)); + BLI_assert(DEG_is_evaluated(&ob)); const int slots_num = BKE_object_material_count_eval(ob, data); @@ -784,7 +784,7 @@ const Material *BKE_object_material_get_eval(const Object &ob, const ID &data, c int BKE_object_material_count_eval(const Object *ob) { - BLI_assert(DEG_is_evaluated_object(ob)); + BLI_assert(DEG_is_evaluated(ob)); if (ob->type == OB_EMPTY) { return 0; } @@ -796,7 +796,7 @@ int BKE_object_material_count_eval(const Object *ob) int BKE_object_material_count_eval(const Object &ob, const ID &data) { - BLI_assert(DEG_is_evaluated_object(&ob)); + BLI_assert(DEG_is_evaluated(&ob)); if (ob.type == OB_EMPTY) { return 0; } diff --git a/source/blender/blenkernel/intern/mesh_convert.cc b/source/blender/blenkernel/intern/mesh_convert.cc index 81ebf6615c4..438629a621c 100644 --- a/source/blender/blenkernel/intern/mesh_convert.cc +++ b/source/blender/blenkernel/intern/mesh_convert.cc @@ -504,7 +504,7 @@ void BKE_mesh_to_curve_nurblist(const Mesh *mesh, ListBase *nurblist, const int void BKE_mesh_to_curve(Main *bmain, Depsgraph *depsgraph, Scene * /*scene*/, Object *ob) { - const Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + const Object *ob_eval = DEG_get_evaluated(depsgraph, ob); if (!ob_eval) { return; } @@ -535,7 +535,7 @@ void BKE_mesh_to_curve(Main *bmain, Depsgraph *depsgraph, Scene * /*scene*/, Obj void BKE_mesh_to_pointcloud(Main *bmain, Depsgraph *depsgraph, Scene * /*scene*/, Object *ob) { BLI_assert(ob->type == OB_MESH); - const Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + const Object *ob_eval = DEG_get_evaluated(depsgraph, ob); if (!ob_eval) { return; } @@ -564,7 +564,7 @@ void BKE_pointcloud_to_mesh(Main *bmain, Depsgraph *depsgraph, Scene * /*scene*/ { BLI_assert(ob->type == OB_POINTCLOUD); - const Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + const Object *ob_eval = DEG_get_evaluated(depsgraph, ob); const blender::bke::GeometrySet geometry = blender::bke::object_get_evaluated_geometry_set( *ob_eval); @@ -717,7 +717,7 @@ static Mesh *mesh_new_from_curve_type_object(const Object *object) { /* If the object is evaluated, it should either have an evaluated mesh or curve data already. * The mesh can be duplicated, or the curve converted to wire mesh edges. */ - if (DEG_is_evaluated_object(object)) { + if (DEG_is_evaluated(object)) { return mesh_new_from_evaluated_curve_type_object(object); } @@ -754,7 +754,7 @@ static Mesh *mesh_new_from_mball_object(Object *object) * ball). * * Create empty mesh so script-authors don't run into None objects. */ - if (!DEG_is_evaluated_object(object)) { + if (!DEG_is_evaluated(object)) { return (Mesh *)BKE_id_new_nomain(ID_ME, ((ID *)object->data)->name + 2); } @@ -790,7 +790,7 @@ static Mesh *mesh_new_from_mesh_object_with_layers(Depsgraph *depsgraph, const bool preserve_origindex, const bool ensure_subdivision) { - if (DEG_is_original_id(&object->id)) { + if (DEG_is_original(object)) { return mesh_new_from_mesh(object, (Mesh *)object->data, ensure_subdivision); } diff --git a/source/blender/blenkernel/intern/mesh_data_update.cc b/source/blender/blenkernel/intern/mesh_data_update.cc index 2fc9c7c5df2..39f07939d14 100644 --- a/source/blender/blenkernel/intern/mesh_data_update.cc +++ b/source/blender/blenkernel/intern/mesh_data_update.cc @@ -1018,7 +1018,7 @@ static void mesh_build_data(Depsgraph &depsgraph, /* Make sure that drivers can target shapekey properties. * Note that this causes a potential inconsistency, as the shapekey may have a * different topology than the evaluated mesh. */ - BLI_assert(mesh->key == nullptr || DEG_is_evaluated_id(&mesh->key->id)); + BLI_assert(mesh->key == nullptr || DEG_is_evaluated(mesh->key)); mesh_eval->key = mesh->key; if ((ob.mode & OB_MODE_ALL_SCULPT) && ob.sculpt) { @@ -1060,7 +1060,7 @@ static void editbmesh_build_data(Depsgraph &depsgraph, /* Make sure that drivers can target shapekey properties. * Note that this causes a potential inconsistency, as the shapekey may have a * different topology than the evaluated mesh. */ - BLI_assert(mesh->key == nullptr || DEG_is_evaluated_id(&mesh->key->id)); + BLI_assert(mesh->key == nullptr || DEG_is_evaluated(mesh->key)); me_final->key = mesh->key; obedit.runtime->editmesh_eval_cage = me_cage; diff --git a/source/blender/blenkernel/intern/modifier.cc b/source/blender/blenkernel/intern/modifier.cc index 45901f1d502..5054814b5b7 100644 --- a/source/blender/blenkernel/intern/modifier.cc +++ b/source/blender/blenkernel/intern/modifier.cc @@ -1004,7 +1004,7 @@ ModifierData *BKE_modifier_get_original(const Object *object, ModifierData *md) ModifierData *BKE_modifier_get_evaluated(Depsgraph *depsgraph, Object *object, ModifierData *md) { - Object *object_eval = DEG_get_evaluated_object(depsgraph, object); + Object *object_eval = DEG_get_evaluated(depsgraph, object); if (object_eval == object) { return md; } diff --git a/source/blender/blenkernel/intern/multires.cc b/source/blender/blenkernel/intern/multires.cc index 5c1b0b52b58..bb7a1176ced 100644 --- a/source/blender/blenkernel/intern/multires.cc +++ b/source/blender/blenkernel/intern/multires.cc @@ -216,7 +216,7 @@ static void multires_mdisps_subdivide_hidden(MDisps *md, const int new_level) Mesh *BKE_multires_create_mesh(Depsgraph *depsgraph, Object *object, MultiresModifierData *mmd) { - Object *object_eval = DEG_get_evaluated_object(depsgraph, object); + Object *object_eval = DEG_get_evaluated(depsgraph, object); Scene *scene_eval = DEG_get_evaluated_scene(depsgraph); Mesh *deformed_mesh = blender::bke::mesh_get_eval_deform( depsgraph, scene_eval, object_eval, &CD_MASK_BAREMESH); @@ -238,7 +238,7 @@ blender::Array BKE_multires_create_deformed_base_mesh_vert_coor Depsgraph *depsgraph, Object *object, MultiresModifierData *mmd) { Scene *scene_eval = DEG_get_evaluated_scene(depsgraph); - Object *object_eval = DEG_get_evaluated_object(depsgraph, object); + Object *object_eval = DEG_get_evaluated(depsgraph, object); Object object_for_eval = blender::dna::shallow_copy(*object_eval); blender::bke::ObjectRuntime runtime = *object_eval->runtime; @@ -376,7 +376,7 @@ void multires_mark_as_modified(Depsgraph *depsgraph, * do an actual update. * * In a longer term maybe special dependency graph tag can help sanitizing this a bit. */ - Object *object_eval = DEG_get_evaluated_object(depsgraph, object); + Object *object_eval = DEG_get_evaluated(depsgraph, object); Mesh *mesh = static_cast(object_eval->data); SubdivCCG *subdiv_ccg = mesh->runtime->subdiv_ccg.get(); if (subdiv_ccg == nullptr) { diff --git a/source/blender/blenkernel/intern/multires_reshape.cc b/source/blender/blenkernel/intern/multires_reshape.cc index 9d1b2bedcb4..ada4b51d5a2 100644 --- a/source/blender/blenkernel/intern/multires_reshape.cc +++ b/source/blender/blenkernel/intern/multires_reshape.cc @@ -52,7 +52,7 @@ bool multiresModifier_reshapeFromObject(Depsgraph *depsgraph, Object *dst, Object *src) { - const Object *ob_eval = DEG_get_evaluated_object(depsgraph, src); + const Object *ob_eval = DEG_get_evaluated(depsgraph, src); if (!ob_eval) { return false; } diff --git a/source/blender/blenkernel/intern/multires_reshape_util.cc b/source/blender/blenkernel/intern/multires_reshape_util.cc index 1cd24fe7727..6142e103e58 100644 --- a/source/blender/blenkernel/intern/multires_reshape_util.cc +++ b/source/blender/blenkernel/intern/multires_reshape_util.cc @@ -41,7 +41,7 @@ blender::bke::subdiv::Subdiv *multires_reshape_create_subdiv(Depsgraph *depsgrap if (depsgraph != nullptr) { Scene *scene_eval = DEG_get_evaluated_scene(depsgraph); - Object *object_eval = DEG_get_evaluated_object(depsgraph, object); + Object *object_eval = DEG_get_evaluated(depsgraph, object); base_mesh = mesh_get_eval_deform(depsgraph, scene_eval, object_eval, &CD_MASK_BAREMESH); } else { diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc index f1364fc69c6..18a7e19c183 100644 --- a/source/blender/blenkernel/intern/object.cc +++ b/source/blender/blenkernel/intern/object.cc @@ -3359,7 +3359,7 @@ blender::float4x4 BKE_object_calc_parent(Depsgraph *depsgraph, Scene *scene, Obj /* Since this is used while calculating parenting, * at this moment ob_eval->parent is still nullptr. */ - workob.parent = DEG_get_evaluated_object(depsgraph, ob->parent); + workob.parent = DEG_get_evaluated(depsgraph, ob->parent); workob.trackflag = ob->trackflag; workob.upflag = ob->upflag; @@ -4230,7 +4230,7 @@ Mesh *BKE_object_get_original_mesh(const Object *object) const Mesh *BKE_object_get_editmesh_eval_final(const Object *object) { - BLI_assert(!DEG_is_original_id(&object->id)); + BLI_assert(!DEG_is_original(object)); BLI_assert(object->type == OB_MESH); const Mesh *mesh = static_cast(object->data); @@ -4245,7 +4245,7 @@ const Mesh *BKE_object_get_editmesh_eval_final(const Object *object) const Mesh *BKE_object_get_editmesh_eval_cage(const Object *object) { - BLI_assert(!DEG_is_original_id(&object->id)); + BLI_assert(!DEG_is_original(object)); BLI_assert(object->type == OB_MESH); return object->runtime->editmesh_eval_cage; @@ -4253,7 +4253,7 @@ const Mesh *BKE_object_get_editmesh_eval_cage(const Object *object) const Mesh *BKE_object_get_mesh_deform_eval(const Object *object) { - BLI_assert(!DEG_is_original_id(&object->id)); + BLI_assert(!DEG_is_original(object)); BLI_assert(object->type == OB_MESH); return object->runtime->mesh_deform_eval; } diff --git a/source/blender/blenkernel/intern/object_dupli.cc b/source/blender/blenkernel/intern/object_dupli.cc index 5c50c097dd9..9174284e24c 100644 --- a/source/blender/blenkernel/intern/object_dupli.cc +++ b/source/blender/blenkernel/intern/object_dupli.cc @@ -844,7 +844,7 @@ static void make_duplis_font(const DupliContext *ctx) family_gh = BLI_ghash_int_new_ex(__func__, 256); /* Safety check even if it might fail badly when called for original object. */ - const bool is_eval_curve = DEG_is_evaluated_id(&cu->id); + const bool is_eval_curve = DEG_is_evaluated(cu); /* Advance matching BLI_str_utf8_as_utf32. */ for (a = 0; a < text_len; a++, ct++) { @@ -856,7 +856,7 @@ static void make_duplis_font(const DupliContext *ctx) if (is_eval_curve) { /* Workaround for the above hack. */ - ob = DEG_get_evaluated_object(ctx->depsgraph, ob); + ob = DEG_get_evaluated(ctx->depsgraph, ob); } if (ob) { diff --git a/source/blender/blenkernel/intern/paint.cc b/source/blender/blenkernel/intern/paint.cc index 4acb9776012..f5257b34c74 100644 --- a/source/blender/blenkernel/intern/paint.cc +++ b/source/blender/blenkernel/intern/paint.cc @@ -2582,7 +2582,7 @@ void BKE_sculpt_update_object_for_edit(Depsgraph *depsgraph, Object *ob_orig, bo { BLI_assert(ob_orig == DEG_get_original(ob_orig)); - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob_orig); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob_orig); sculpt_update_object(depsgraph, ob_orig, ob_eval, is_paint_tool); } @@ -2800,7 +2800,7 @@ pbvh::Tree &pbvh_ensure(Depsgraph &depsgraph, Object &object) ss.pbvh = build_pbvh_for_dynamic_topology(&object); } else { - Object *object_eval = DEG_get_evaluated_object(&depsgraph, &object); + Object *object_eval = DEG_get_evaluated(&depsgraph, &object); Mesh *mesh_eval = static_cast(object_eval->data); if (mesh_eval->runtime->subdiv_ccg != nullptr) { ss.pbvh = build_pbvh_from_ccg(&object, *mesh_eval->runtime->subdiv_ccg); diff --git a/source/blender/blenkernel/intern/particle.cc b/source/blender/blenkernel/intern/particle.cc index e67fb80310e..265791db00c 100644 --- a/source/blender/blenkernel/intern/particle.cc +++ b/source/blender/blenkernel/intern/particle.cc @@ -666,7 +666,7 @@ ParticleSystem *psys_orig_get(ParticleSystem *psys) ParticleSystem *psys_eval_get(Depsgraph *depsgraph, Object *object, ParticleSystem *psys) { - Object *object_eval = DEG_get_evaluated_object(depsgraph, object); + Object *object_eval = DEG_get_evaluated(depsgraph, object); if (object_eval == object) { return psys; } diff --git a/source/blender/blenkernel/intern/pbvh.cc b/source/blender/blenkernel/intern/pbvh.cc index 043dbe2923e..9cea2c3d895 100644 --- a/source/blender/blenkernel/intern/pbvh.cc +++ b/source/blender/blenkernel/intern/pbvh.cc @@ -1060,8 +1060,8 @@ void Tree::update_normals(Object &object_orig, Object &object_eval) void update_normals(const Depsgraph &depsgraph, Object &object_orig, Tree &pbvh) { - BLI_assert(DEG_is_original_object(&object_orig)); - Object &object_eval = *DEG_get_evaluated_object(&depsgraph, &object_orig); + BLI_assert(DEG_is_original(&object_orig)); + Object &object_eval = *DEG_get_evaluated(&depsgraph, &object_orig); pbvh.update_normals(object_orig, object_eval); } @@ -2403,40 +2403,39 @@ static MutableSpan vert_positions_eval_for_write(Object &object_orig, Ob Span vert_positions_eval(const Depsgraph &depsgraph, const Object &object_orig) { - const Object &object_eval = *DEG_get_evaluated_object(&depsgraph, - &const_cast(object_orig)); + const Object &object_eval = *DEG_get_evaluated(&depsgraph, &const_cast(object_orig)); return vert_positions_eval(object_orig, object_eval); } Span vert_positions_eval_from_eval(const Object &object_eval) { - BLI_assert(!DEG_is_original_object(&object_eval)); + BLI_assert(!DEG_is_original(&object_eval)); const Object &object_orig = *DEG_get_original(&object_eval); return vert_positions_eval(object_orig, object_eval); } MutableSpan vert_positions_eval_for_write(const Depsgraph &depsgraph, Object &object_orig) { - Object &object_eval = *DEG_get_evaluated_object(&depsgraph, &object_orig); + Object &object_eval = *DEG_get_evaluated(&depsgraph, &object_orig); return vert_positions_eval_for_write(object_orig, object_eval); } Span vert_normals_eval(const Depsgraph &depsgraph, const Object &object_orig) { - const Object &object_eval = *DEG_get_evaluated_object(&depsgraph, &object_orig); + const Object &object_eval = *DEG_get_evaluated(&depsgraph, &object_orig); return vert_normals_cache_eval(object_orig, object_eval).data(); } Span vert_normals_eval_from_eval(const Object &object_eval) { - BLI_assert(!DEG_is_original_object(&object_eval)); + BLI_assert(!DEG_is_original(&object_eval)); const Object &object_orig = *DEG_get_original(&object_eval); return vert_normals_cache_eval(object_orig, object_eval).data(); } Span face_normals_eval_from_eval(const Object &object_eval) { - BLI_assert(!DEG_is_original_object(&object_eval)); + BLI_assert(!DEG_is_original(&object_eval)); const Object &object_orig = *DEG_get_original(&object_eval); return face_normals_cache_eval(object_orig, object_eval).data(); } diff --git a/source/blender/blenkernel/intern/pointcache.cc b/source/blender/blenkernel/intern/pointcache.cc index 5524d4ebede..cfa0e39939f 100644 --- a/source/blender/blenkernel/intern/pointcache.cc +++ b/source/blender/blenkernel/intern/pointcache.cc @@ -3358,7 +3358,7 @@ void BKE_ptcache_bake(PTCacheBaker *baker) * PTCacheID is in a fully evaluated state. */ PTCacheID pid_eval; Object *ob = reinterpret_cast(pid->owner_id); - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob); ParticleSystem *psys = static_cast(pid->calldata); ParticleSystem *psys_eval = psys_eval_get(depsgraph, ob, psys); BKE_ptcache_id_from_particles(&pid_eval, ob_eval, psys_eval); @@ -3401,7 +3401,7 @@ void BKE_ptcache_bake(PTCacheBaker *baker) * PTCacheID is in a fully evaluated state. */ PTCacheID pid_eval; Object *ob = reinterpret_cast(pid->owner_id); - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob); ParticleSystem *psys = static_cast(pid->calldata); ParticleSystem *psys_eval = psys_eval_get(depsgraph, ob, psys); BKE_ptcache_id_from_particles(&pid_eval, ob_eval, psys_eval); diff --git a/source/blender/blenkernel/intern/scene.cc b/source/blender/blenkernel/intern/scene.cc index b6dab451950..a4466a6bb5b 100644 --- a/source/blender/blenkernel/intern/scene.cc +++ b/source/blender/blenkernel/intern/scene.cc @@ -2471,7 +2471,7 @@ void BKE_scene_update_sound(Depsgraph *depsgraph, Main *bmain) void BKE_scene_update_tag_audio_volume(Depsgraph * /*depsgraph*/, Scene *scene) { - BLI_assert(DEG_is_evaluated_id(&scene->id)); + BLI_assert(DEG_is_evaluated(scene)); /* The volume is actually updated in BKE_scene_update_sound(), from either * scene_graph_update_tagged() or from BKE_scene_graph_update_for_newframe(). */ scene->id.recalc |= ID_RECALC_AUDIO_VOLUME; diff --git a/source/blender/blenkernel/intern/shrinkwrap.cc b/source/blender/blenkernel/intern/shrinkwrap.cc index 17b9c65bb71..6efad8c4342 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.cc +++ b/source/blender/blenkernel/intern/shrinkwrap.cc @@ -1367,7 +1367,7 @@ void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd, calc.invert_vgroup = (smd->shrinkOpts & MOD_SHRINKWRAP_INVERT_VGROUP) != 0; if (smd->target != nullptr) { - Object *ob_target = DEG_get_evaluated_object(ctx->depsgraph, smd->target); + Object *ob_target = DEG_get_evaluated(ctx->depsgraph, smd->target); calc.target = BKE_modifier_get_evaluated_mesh_from_evaluated_object(ob_target); /* TODO: there might be several "bugs" with non-uniform scales matrices @@ -1378,7 +1378,7 @@ void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd, /* TODO: smd->keepDist is in global units.. must change to local */ calc.keepDist = smd->keepDist; } - calc.aux_target = DEG_get_evaluated_object(ctx->depsgraph, smd->auxTarget); + calc.aux_target = DEG_get_evaluated(ctx->depsgraph, smd->auxTarget); if (mesh != nullptr && smd->shrinkType == MOD_SHRINKWRAP_PROJECT) { /* Setup arrays to get vertex positions, normals and deform weights */ diff --git a/source/blender/bmesh/intern/bmesh_mesh_convert.cc b/source/blender/bmesh/intern/bmesh_mesh_convert.cc index 481939662a2..d600a14beb5 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_convert.cc +++ b/source/blender/bmesh/intern/bmesh_mesh_convert.cc @@ -319,7 +319,7 @@ void BM_mesh_bm_from_me(BMesh *bm, const Mesh *mesh, const BMeshFromMeshParams * /* -------------------------------------------------------------------- */ /* Shape Key */ int tot_shape_keys = 0; - if (mesh->key != nullptr && DEG_is_original_id(&mesh->id)) { + if (mesh->key != nullptr && DEG_is_original(mesh)) { /* Evaluated meshes can be topologically inconsistent with their shape keys. * Shape keys are also already integrated into the state of the evaluated * mesh, so considering them here would kind of apply them twice. */ diff --git a/source/blender/depsgraph/DEG_depsgraph_query.hh b/source/blender/depsgraph/DEG_depsgraph_query.hh index da5addff2f4..cbcfd95d783 100644 --- a/source/blender/depsgraph/DEG_depsgraph_query.hh +++ b/source/blender/depsgraph/DEG_depsgraph_query.hh @@ -89,10 +89,6 @@ Scene *DEG_get_evaluated_scene(const Depsgraph *graph); */ ViewLayer *DEG_get_evaluated_view_layer(const Depsgraph *graph); -/** Get evaluated version of object for given original one. */ -Object *DEG_get_evaluated_object(const Depsgraph *depsgraph, Object *object); -const Object *DEG_get_evaluated_object(const Depsgraph *depsgraph, const Object *object); - /** Get evaluated version of given ID data-block. */ ID *DEG_get_evaluated_id(const Depsgraph *depsgraph, ID *id); const ID *DEG_get_evaluated_id(const Depsgraph *depsgraph, const ID *id); @@ -148,14 +144,24 @@ Depsgraph *DEG_get_depsgraph_by_id(const ID &id); * are not out-of-main localized data-blocks. */ bool DEG_is_original_id(const ID *id); -bool DEG_is_original_object(const Object *object); + +template bool DEG_is_original(const T *id) +{ + static_assert(blender::dna::is_ID_v); + return DEG_is_original_id(reinterpret_cast(id)); +} /* Opposite of the above (`DEG_is_original_*`). * * If the data-block is not original it must be evaluated, and vice versa. */ bool DEG_is_evaluated_id(const ID *id); -bool DEG_is_evaluated_object(const Object *object); + +template bool DEG_is_evaluated(const T *id) +{ + static_assert(blender::dna::is_ID_v); + return DEG_is_evaluated_id(reinterpret_cast(id)); +} /** * Check whether depsgraph is fully evaluated. This includes the following checks: diff --git a/source/blender/depsgraph/intern/depsgraph_light_linking.cc b/source/blender/depsgraph/intern/depsgraph_light_linking.cc index 3e9c9e79355..65f92c77786 100644 --- a/source/blender/depsgraph/intern/depsgraph_light_linking.cc +++ b/source/blender/depsgraph/intern/depsgraph_light_linking.cc @@ -53,7 +53,7 @@ namespace { #ifndef NDEBUG bool is_valid_input_id(const ID &id) { - return (id.tag & ID_TAG_LOCALIZED) || DEG_is_original_id(&id); + return (id.tag & ID_TAG_LOCALIZED) || DEG_is_original(&id); } #endif diff --git a/source/blender/depsgraph/intern/depsgraph_query.cc b/source/blender/depsgraph/intern/depsgraph_query.cc index 48e1674c559..68eb54db081 100644 --- a/source/blender/depsgraph/intern/depsgraph_query.cc +++ b/source/blender/depsgraph/intern/depsgraph_query.cc @@ -206,19 +206,6 @@ ViewLayer *DEG_get_evaluated_view_layer(const Depsgraph *graph) return view_layer_cow; } -Object *DEG_get_evaluated_object(const Depsgraph *depsgraph, Object *object) -{ - if (object == nullptr) { - return nullptr; - } - return (Object *)DEG_get_evaluated_id(depsgraph, &object->id); -} - -const Object *DEG_get_evaluated_object(const Depsgraph *depsgraph, const Object *object) -{ - return DEG_get_evaluated_object(depsgraph, const_cast(object)); -} - ID *DEG_get_evaluated_id(const Depsgraph *depsgraph, ID *id) { return deg::get_evaluated_id(reinterpret_cast(depsgraph), id); @@ -323,21 +310,11 @@ bool DEG_is_original_id(const ID *id) return true; } -bool DEG_is_original_object(const Object *object) -{ - return DEG_is_original_id(&object->id); -} - bool DEG_is_evaluated_id(const ID *id) { return !DEG_is_original_id(id); } -bool DEG_is_evaluated_object(const Object *object) -{ - return !DEG_is_original_object(object); -} - bool DEG_is_fully_evaluated(const Depsgraph *depsgraph) { const deg::Depsgraph *deg_graph = (const deg::Depsgraph *)depsgraph; diff --git a/source/blender/draw/engines/eevee/eevee_instance.cc b/source/blender/draw/engines/eevee/eevee_instance.cc index 9e8761253ba..87a20564320 100644 --- a/source/blender/draw/engines/eevee/eevee_instance.cc +++ b/source/blender/draw/engines/eevee/eevee_instance.cc @@ -269,9 +269,8 @@ void Instance::update_eval_members() { scene = DEG_get_evaluated_scene(depsgraph); view_layer = DEG_get_evaluated_view_layer(depsgraph); - camera_eval_object = (camera_orig_object) ? - DEG_get_evaluated_object(depsgraph, camera_orig_object) : - nullptr; + camera_eval_object = (camera_orig_object) ? DEG_get_evaluated(depsgraph, camera_orig_object) : + nullptr; } /** \} */ diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.cc b/source/blender/draw/engines/eevee/eevee_lightcache.cc index 4578ade1c58..857349ce1ec 100644 --- a/source/blender/draw/engines/eevee/eevee_lightcache.cc +++ b/source/blender/draw/engines/eevee/eevee_lightcache.cc @@ -160,7 +160,7 @@ class LightBake { context_disable(); for (auto i : original_probes_.index_range()) { - Object *eval_ob = DEG_get_evaluated_object(depsgraph_, original_probes_[i]); + Object *eval_ob = DEG_get_evaluated(depsgraph_, original_probes_[i]); instance_->light_bake_irradiance( *eval_ob, diff --git a/source/blender/draw/engines/gpencil/gpencil_render.cc b/source/blender/draw/engines/gpencil/gpencil_render.cc index 74f2be6c3d2..a7fa3f94699 100644 --- a/source/blender/draw/engines/gpencil/gpencil_render.cc +++ b/source/blender/draw/engines/gpencil/gpencil_render.cc @@ -51,7 +51,7 @@ static void render_set_view(RenderEngine *engine, const Depsgraph *depsgraph, const float2 aa_offset = float2{0.0f}) { - Object *camera = DEG_get_evaluated_object(depsgraph, RE_GetCamera(engine->re)); + Object *camera = DEG_get_evaluated(depsgraph, RE_GetCamera(engine->re)); float4x4 winmat, viewinv; RE_GetCameraWindow(engine->re, camera, winmat.ptr()); @@ -294,7 +294,7 @@ void Engine::render_to_image(RenderEngine *engine, RenderLayer *render_layer, co render_init_buffers(draw_ctx, inst, engine, render_layer, &rect, false); inst.init(); - inst.camera = DEG_get_evaluated_object(depsgraph, RE_GetCamera(engine->re)); + inst.camera = DEG_get_evaluated(depsgraph, RE_GetCamera(engine->re)); manager.begin_sync(); diff --git a/source/blender/draw/engines/overlay/overlay_camera.hh b/source/blender/draw/engines/overlay/overlay_camera.hh index 5e220f7085e..a5cf1114c28 100644 --- a/source/blender/draw/engines/overlay/overlay_camera.hh +++ b/source/blender/draw/engines/overlay/overlay_camera.hh @@ -292,7 +292,7 @@ class Cameras : Overlay { const RegionView3D *rv3d = state.rv3d; const Camera &cam = DRW_object_get_data_for_drawing(*ob); - const Object *camera_object = DEG_get_evaluated_object(state.depsgraph, v3d->camera); + const Object *camera_object = DEG_get_evaluated(state.depsgraph, v3d->camera); const bool is_select = res.is_selection(); const bool is_active = (ob == camera_object); const bool is_camera_view = (is_active && (rv3d->persp == RV3D_CAMOB)); @@ -560,7 +560,7 @@ class Cameras : Overlay { { Object *ob = ob_ref.object; const Camera &cam = DRW_object_get_data_for_drawing(*ob_ref.object); - const Object *camera_object = DEG_get_evaluated_object(state.depsgraph, state.v3d->camera); + const Object *camera_object = DEG_get_evaluated(state.depsgraph, state.v3d->camera); const bool is_active = ob_ref.object == camera_object; const bool is_camera_view = (is_active && (state.rv3d->persp == RV3D_CAMOB)); diff --git a/source/blender/draw/engines/overlay/overlay_grid.hh b/source/blender/draw/engines/overlay/overlay_grid.hh index d60fd53c821..83b66d4ed0b 100644 --- a/source/blender/draw/engines/overlay/overlay_grid.hh +++ b/source/blender/draw/engines/overlay/overlay_grid.hh @@ -256,7 +256,7 @@ class Grid : Overlay { } if (rv3d->persp == RV3D_CAMOB && v3d->camera && v3d->camera->type == OB_CAMERA) { - Object *camera_object = DEG_get_evaluated_object(state.depsgraph, v3d->camera); + Object *camera_object = DEG_get_evaluated(state.depsgraph, v3d->camera); v3d_clip_end_ = ((Camera *)(camera_object->data))->clip_end; grid_flag_ |= GRID_CAMERA; zneg_flag_ |= GRID_CAMERA; diff --git a/source/blender/draw/engines/overlay/overlay_motion_path.hh b/source/blender/draw/engines/overlay/overlay_motion_path.hh index b8a317dfce3..9d57688e4c6 100644 --- a/source/blender/draw/engines/overlay/overlay_motion_path.hh +++ b/source/blender/draw/engines/overlay/overlay_motion_path.hh @@ -154,7 +154,7 @@ class MotionPath : Overlay { if ((eMotionPath_BakeFlag(avs.path_bakeflag) & MOTIONPATH_BAKE_CAMERA_SPACE) && state.v3d->camera) { - camera_eval = DEG_get_evaluated_object(state.depsgraph, state.v3d->camera); + camera_eval = DEG_get_evaluated(state.depsgraph, state.v3d->camera); } /* Draw curve-line of path. */ diff --git a/source/blender/draw/engines/workbench/workbench_engine.cc b/source/blender/draw/engines/workbench/workbench_engine.cc index 83543be1f18..c11c45b8651 100644 --- a/source/blender/draw/engines/workbench/workbench_engine.cc +++ b/source/blender/draw/engines/workbench/workbench_engine.cc @@ -699,7 +699,7 @@ static void workbench_render_to_image(RenderEngine *engine, RenderLayer *layer, workbench::Instance instance; /* TODO(sergey): Shall render hold pointer to an evaluated camera instead? */ - Object *camera_ob = DEG_get_evaluated_object(depsgraph, RE_GetCamera(engine->re)); + Object *camera_ob = DEG_get_evaluated(depsgraph, RE_GetCamera(engine->re)); /* Set the perspective, view and window matrix. */ float4x4 winmat, viewmat, viewinv; diff --git a/source/blender/draw/intern/draw_select_buffer.cc b/source/blender/draw/intern/draw_select_buffer.cc index ca93d1c0ab5..e243fc75b40 100644 --- a/source/blender/draw/intern/draw_select_buffer.cc +++ b/source/blender/draw/intern/draw_select_buffer.cc @@ -438,7 +438,7 @@ uint DRW_select_buffer_context_offset_for_object_elem(Depsgraph *depsgraph, { SELECTID_Context *select_ctx = DRW_select_engine_context_get(); - Object *ob_eval = DEG_get_evaluated_object(depsgraph, object); + Object *ob_eval = DEG_get_evaluated(depsgraph, object); const ElemIndexRanges base_ofs = select_ctx->elem_ranges.lookup_default(ob_eval, ElemIndexRanges{}); @@ -472,7 +472,7 @@ void DRW_select_buffer_context_create(Depsgraph *depsgraph, for (const int i : bases.index_range()) { Object *obj = bases[i]->object; - select_ctx->objects[i] = DEG_get_evaluated_object(depsgraph, obj); + select_ctx->objects[i] = DEG_get_evaluated(depsgraph, obj); } select_ctx->select_mode = select_mode; diff --git a/source/blender/editors/animation/anim_motion_paths.cc b/source/blender/editors/animation/anim_motion_paths.cc index 95fbbed4ae2..4f479383624 100644 --- a/source/blender/editors/animation/anim_motion_paths.cc +++ b/source/blender/editors/animation/anim_motion_paths.cc @@ -180,7 +180,7 @@ static void motionpaths_calc_bake_targets(blender::Span targets, } if (mpath->flag & MOTIONPATH_FLAG_BAKE_CAMERA && camera) { - Object *cam_eval = DEG_get_evaluated_object(depsgraph, camera); + Object *cam_eval = DEG_get_evaluated(depsgraph, camera); /* Convert point to camera space. */ float3 co_camera_space = math::transform_point(cam_eval->world_to_object(), float3(mpv->co)); copy_v3_v3(mpv->co, co_camera_space); @@ -459,7 +459,7 @@ void animviz_calc_motionpaths(Depsgraph *depsgraph, } for (MPathTarget *mpt : targets) { - mpt->ob_eval = DEG_get_evaluated_object(depsgraph, mpt->ob); + mpt->ob_eval = DEG_get_evaluated(depsgraph, mpt->ob); AnimData *adt = BKE_animdata_from_id(&mpt->ob_eval->id); diff --git a/source/blender/editors/armature/armature_skinning.cc b/source/blender/editors/armature/armature_skinning.cc index be5f6e059f4..c906f935ae6 100644 --- a/source/blender/editors/armature/armature_skinning.cc +++ b/source/blender/editors/armature/armature_skinning.cc @@ -404,7 +404,7 @@ static void add_verts_to_dgroups(ReportList *reports, if (wpmode) { /* if in weight paint mode, use final verts from evaluated mesh */ - const Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + const Object *ob_eval = DEG_get_evaluated(depsgraph, ob); const Mesh *mesh_eval = BKE_object_get_evaluated_mesh(ob_eval); if (mesh_eval) { BKE_mesh_foreach_mapped_vert_coords_get(mesh_eval, verts, mesh->verts_num); diff --git a/source/blender/editors/armature/pose_transform.cc b/source/blender/editors/armature/pose_transform.cc index e4405e795a0..b824fda2b35 100644 --- a/source/blender/editors/armature/pose_transform.cc +++ b/source/blender/editors/armature/pose_transform.cc @@ -393,7 +393,7 @@ static wmOperatorStatus apply_armature_pose2bones_exec(bContext *C, wmOperator * Scene *scene = CTX_data_scene(C); /* must be active object, not edit-object */ Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C)); - const Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + const Object *ob_eval = DEG_get_evaluated(depsgraph, ob); bArmature *arm = BKE_armature_from_object(ob); bPose *pose; blender::Vector selected_bones; @@ -1187,7 +1187,7 @@ static wmOperatorStatus pose_clear_transform_generic_exec(bContext *C, View3D *v3d = CTX_wm_view3d(C); FOREACH_OBJECT_IN_MODE_BEGIN (scene, view_layer, v3d, OB_ARMATURE, OB_MODE_POSE, ob_iter) { /* XXX: UGLY HACK (for auto-key + clear transforms). */ - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob_iter); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob_iter); blender::Vector sources; bool changed = false; diff --git a/source/blender/editors/curve/editcurve.cc b/source/blender/editors/curve/editcurve.cc index 7ef9a1f084d..0a1af6ddfa4 100644 --- a/source/blender/editors/curve/editcurve.cc +++ b/source/blender/editors/curve/editcurve.cc @@ -7155,7 +7155,7 @@ static wmOperatorStatus match_texture_space_exec(bContext *C, wmOperator * /*op* (void)depsgraph; Object *object = CTX_data_active_object(C); - Object *object_eval = DEG_get_evaluated_object(depsgraph, object); + Object *object_eval = DEG_get_evaluated(depsgraph, object); Curve *curve = (Curve *)object->data; float min[3], max[3], texspace_size[3], texspace_location[3]; int a; diff --git a/source/blender/editors/curve/editfont.cc b/source/blender/editors/curve/editfont.cc index 64ac884779f..0b1912ee93f 100644 --- a/source/blender/editors/curve/editfont.cc +++ b/source/blender/editors/curve/editfont.cc @@ -418,7 +418,7 @@ static void text_update_edited(bContext *C, Object *obedit, const eEditFontMode /* depsgraph runs above, but since we're not tagging for update, call direct */ /* We need evaluated data here. */ Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); - BKE_vfont_to_curve(DEG_get_evaluated_object(depsgraph, obedit), mode); + BKE_vfont_to_curve(DEG_get_evaluated(depsgraph, obedit), mode); } cu->curinfo = ef->textbufinfo[ef->pos ? ef->pos - 1 : 0]; @@ -1462,14 +1462,14 @@ static wmOperatorStatus move_cursor(bContext *C, int type, const bool select) /* apply vertical cursor motion to position immediately * otherwise the selection will lag behind */ if (FO_CURS_IS_MOTION(cursmove)) { - BKE_vfont_to_curve(DEG_get_evaluated_object(depsgraph, obedit), eEditFontMode(cursmove)); + BKE_vfont_to_curve(DEG_get_evaluated(depsgraph, obedit), eEditFontMode(cursmove)); cursmove = FO_CURS; } if (select == 0) { if (ef->selstart) { ef->selstart = ef->selend = 0; - BKE_vfont_to_curve(DEG_get_evaluated_object(depsgraph, obedit), FO_SELCHANGE); + BKE_vfont_to_curve(DEG_get_evaluated(depsgraph, obedit), FO_SELCHANGE); } } @@ -2031,7 +2031,7 @@ static int font_cursor_text_index_from_event(bContext *C, Object *obedit, const static void font_cursor_set_apply(bContext *C, const wmEvent *event) { Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); - Object *ob = DEG_get_evaluated_object(depsgraph, CTX_data_active_object(C)); + Object *ob = DEG_get_evaluated(depsgraph, CTX_data_active_object(C)); Curve *cu = static_cast(ob->data); EditFont *ef = cu->editfont; BLI_assert(ef->len >= 0); diff --git a/source/blender/editors/curves/intern/curves_ops.cc b/source/blender/editors/curves/intern/curves_ops.cc index 5c57af64279..bfa89065598 100644 --- a/source/blender/editors/curves/intern/curves_ops.cc +++ b/source/blender/editors/curves/intern/curves_ops.cc @@ -528,7 +528,7 @@ static wmOperatorStatus curves_convert_from_particle_system_exec(bContext *C, wm if (psys_orig == nullptr) { return OPERATOR_CANCELLED; } - Object *ob_from_eval = DEG_get_evaluated_object(&depsgraph, ob_from_orig); + Object *ob_from_eval = DEG_get_evaluated(&depsgraph, ob_from_orig); ParticleSystem *psys_eval = nullptr; LISTBASE_FOREACH (ModifierData *, md, &ob_from_eval->modifiers) { if (md->type != eModifierType_ParticleSystem) { diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_bake_animation.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_bake_animation.cc index 0a8f80c7852..04b0d24238c 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_bake_animation.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_bake_animation.cc @@ -170,7 +170,7 @@ static wmOperatorStatus bake_grease_pencil_animation_exec(bContext *C, wmOperato WM_cursor_wait(true); GreasePencil &target = *static_cast(target_object->data); - Object *target_object_eval = DEG_get_evaluated_object(&depsgraph, target_object); + Object *target_object_eval = DEG_get_evaluated(&depsgraph, target_object); std::optional> keyframes; if (only_selected) { @@ -192,7 +192,7 @@ static wmOperatorStatus bake_grease_pencil_animation_exec(bContext *C, wmOperato BKE_scene_graph_update_for_newframe(&depsgraph); for (Object *source_object : bake_targets) { - Object *source_object_eval = DEG_get_evaluated_object(&depsgraph, source_object); + Object *source_object_eval = DEG_get_evaluated(&depsgraph, source_object); GreasePencil &source_eval_grease_pencil = *static_cast( source_object_eval->data); const float4x4 to_target = source_object_eval->object_to_world() * target_imat; diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_select.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_select.cc index c44cadeae9a..c59a9aeb964 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_select.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_select.cc @@ -217,7 +217,7 @@ bool selection_update(const ViewContext *vc, using namespace blender; Object *object = (vc->obedit ? vc->obedit : vc->obact); - const Object *ob_eval = DEG_get_evaluated_object(vc->depsgraph, object); + const Object *ob_eval = DEG_get_evaluated(vc->depsgraph, object); GreasePencil &grease_pencil = *static_cast(object->data); /* Get selection domain from tool settings. */ diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_trim.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_trim.cc index 487c140a168..4ebf19e9325 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_trim.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_trim.cc @@ -149,7 +149,7 @@ static wmOperatorStatus stroke_trim_execute(const bContext *C, const Span const RegionView3D *rv3d = CTX_wm_region_view3d(C); const Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C); Object *obact = CTX_data_active_object(C); - Object *ob_eval = DEG_get_evaluated_object(depsgraph, obact); + Object *ob_eval = DEG_get_evaluated(depsgraph, obact); GreasePencil &grease_pencil = *static_cast(obact->data); diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_weight_paint.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_weight_paint.cc index 9db504fa47b..231910e9cc4 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_weight_paint.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_weight_paint.cc @@ -468,7 +468,7 @@ static wmOperatorStatus weight_sample_invoke(bContext *C, BLI_findlink(BKE_object_defgroup_list(vc.obact), object_defgroup_nr)); /* Collect visible drawings. */ - const Object *ob_eval = DEG_get_evaluated_object(vc.depsgraph, vc.obact); + const Object *ob_eval = DEG_get_evaluated(vc.depsgraph, vc.obact); GreasePencil &grease_pencil = *static_cast(vc.obact->data); const Vector drawings = retrieve_visible_drawings(*vc.scene, grease_pencil, false); diff --git a/source/blender/editors/mesh/editface.cc b/source/blender/editors/mesh/editface.cc index 42b1411f0c0..e2b16c1bf32 100644 --- a/source/blender/editors/mesh/editface.cc +++ b/source/blender/editors/mesh/editface.cc @@ -61,7 +61,7 @@ void paintface_flush_flags(bContext *C, } Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob); if (ob_eval == nullptr) { return; @@ -423,7 +423,7 @@ void paintface_select_loop(bContext *C, Object *ob, const int mval[2], const boo ViewContext vc = ED_view3d_viewcontext_init(C, depsgraph); ED_view3d_select_id_validate(&vc); - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob); if (!ob_eval) { return; } diff --git a/source/blender/editors/mesh/editmesh_knife_project.cc b/source/blender/editors/mesh/editmesh_knife_project.cc index fea6e9c3023..41ba0fae13b 100644 --- a/source/blender/editors/mesh/editmesh_knife_project.cc +++ b/source/blender/editors/mesh/editmesh_knife_project.cc @@ -48,12 +48,12 @@ static LinkNode *knifeproject_poly_from_object(const bContext *C, Object *ob, Li bool mesh_eval_needs_free; if (ob->type == OB_MESH || ob->runtime->data_eval) { - const Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + const Object *ob_eval = DEG_get_evaluated(depsgraph, ob); mesh_eval = BKE_object_get_evaluated_mesh(ob_eval); mesh_eval_needs_free = false; } else if (ELEM(ob->type, OB_FONT, OB_CURVES_LEGACY, OB_SURF)) { - const Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + const Object *ob_eval = DEG_get_evaluated(depsgraph, ob); mesh_eval = BKE_mesh_new_nomain_from_curve(ob_eval); mesh_eval_needs_free = true; } diff --git a/source/blender/editors/mesh/editmesh_loopcut.cc b/source/blender/editors/mesh/editmesh_loopcut.cc index 3825bacf01e..7fd2f590d3d 100644 --- a/source/blender/editors/mesh/editmesh_loopcut.cc +++ b/source/blender/editors/mesh/editmesh_loopcut.cc @@ -141,7 +141,7 @@ static void ringsel_find_edge(RingSelOpData *lcd, const int previewlines) MeshCoordsCache *gcache = &lcd->geom_cache[lcd->base_index]; if (gcache->is_init == false) { Scene *scene_eval = DEG_get_evaluated(lcd->vc.depsgraph, lcd->vc.scene); - Object *ob_eval = DEG_get_evaluated_object(lcd->vc.depsgraph, lcd->ob); + Object *ob_eval = DEG_get_evaluated(lcd->vc.depsgraph, lcd->ob); BMEditMesh *em_eval = BKE_editmesh_from_object(ob_eval); gcache->vert_positions = BKE_editmesh_vert_coords_when_deformed( lcd->vc.depsgraph, em_eval, scene_eval, ob_eval, gcache->allocated_vert_positions); diff --git a/source/blender/editors/mesh/editmesh_select.cc b/source/blender/editors/mesh/editmesh_select.cc index ca68a83ca3d..1b7ceaf4541 100644 --- a/source/blender/editors/mesh/editmesh_select.cc +++ b/source/blender/editors/mesh/editmesh_select.cc @@ -1152,7 +1152,7 @@ bool EDBM_unified_findnearest_from_raycast(ViewContext *vc, Span vert_positions; { - const Object *obedit_eval = DEG_get_evaluated_object(vc->depsgraph, obedit); + const Object *obedit_eval = DEG_get_evaluated(vc->depsgraph, obedit); const Mesh *mesh_eval = BKE_object_get_editmesh_eval_cage(obedit_eval); if (BKE_mesh_wrapper_vert_len(mesh_eval) == bm->totvert) { vert_positions = BKE_mesh_wrapper_vert_coords(mesh_eval); diff --git a/source/blender/editors/mesh/meshtools.cc b/source/blender/editors/mesh/meshtools.cc index daf199985d9..6418f46811d 100644 --- a/source/blender/editors/mesh/meshtools.cc +++ b/source/blender/editors/mesh/meshtools.cc @@ -774,7 +774,7 @@ wmOperatorStatus ED_mesh_shapes_join_objects_exec(bContext *C, int keys_changed = 0; Scene *scene_eval = DEG_get_evaluated_scene(&depsgraph); for (Object *object : compatible_objects) { - Object *object_eval = DEG_get_evaluated_object(&depsgraph, object); + Object *object_eval = DEG_get_evaluated(&depsgraph, object); Mesh *deformed_mesh = blender::bke::mesh_get_eval_deform( &depsgraph, scene_eval, object_eval, &CD_MASK_BAREMESH); if (!deformed_mesh) { @@ -1224,7 +1224,7 @@ bool ED_mesh_pick_face_vert( BLI_assert(mesh && GS(mesh->id.name) == ID_ME); if (ED_mesh_pick_face(C, ob, mval, dist_px, &face_index)) { - const Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + const Object *ob_eval = DEG_get_evaluated(depsgraph, ob); const Mesh *mesh_eval = BKE_object_get_evaluated_mesh(ob_eval); if (!mesh_eval) { return false; @@ -1402,7 +1402,7 @@ bool ED_mesh_pick_vert( (*r_index)--; } else { - const Object *ob_eval = DEG_get_evaluated_object(vc.depsgraph, ob); + const Object *ob_eval = DEG_get_evaluated(vc.depsgraph, ob); const Mesh *mesh_eval = BKE_object_get_evaluated_mesh(ob_eval); ARegion *region = vc.region; RegionView3D *rv3d = static_cast(region->regiondata); diff --git a/source/blender/editors/object/object_add.cc b/source/blender/editors/object/object_add.cc index 88cfb4b9fc7..f4b05bf825c 100644 --- a/source/blender/editors/object/object_add.cc +++ b/source/blender/editors/object/object_add.cc @@ -2462,7 +2462,7 @@ static void make_object_duplilist_real(bContext *C, ViewLayer *view_layer = CTX_data_view_layer(C); GHash *parent_gh = nullptr, *instancer_gh = nullptr; - Object *object_eval = DEG_get_evaluated_object(depsgraph, base->object); + Object *object_eval = DEG_get_evaluated(depsgraph, base->object); if (!(base->object->transflag & OB_DUPLI) && !bke::object_has_geometry_set_instances(*object_eval)) @@ -2765,7 +2765,7 @@ static const EnumPropertyItem *convert_target_itemf(bContext *C, static void object_data_convert_curve_to_mesh(Main *bmain, Depsgraph *depsgraph, Object *ob) { - Object *object_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *object_eval = DEG_get_evaluated(depsgraph, ob); Curve *curve = static_cast(ob->data); Mesh *mesh = BKE_mesh_new_from_object_to_bmain(bmain, depsgraph, object_eval, true); @@ -2931,7 +2931,7 @@ static Object *convert_curves_component_to_curves(Base &base, Object *ob = base.object, *newob = nullptr; ob->flag |= OB_DONE; - Object *ob_eval = DEG_get_evaluated_object(info.depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(info.depsgraph, ob); bke::GeometrySet geometry; if (ob_eval->runtime->geometry_set_eval != nullptr) { geometry = *ob_eval->runtime->geometry_set_eval; @@ -2969,7 +2969,7 @@ static Object *convert_grease_pencil_component_to_curves(Base &base, Object *ob = base.object, *newob = nullptr; ob->flag |= OB_DONE; - Object *ob_eval = DEG_get_evaluated_object(info.depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(info.depsgraph, ob); bke::GeometrySet geometry; if (ob_eval->runtime->geometry_set_eval != nullptr) { geometry = *ob_eval->runtime->geometry_set_eval; @@ -3054,7 +3054,7 @@ static Object *convert_mesh_to_mesh(Base &base, ObjectConversionInfo &info, Base /* NOTE: get the mesh from the original, not from the copy in some * cases this doesn't give correct results (when MDEF is used for eg) */ - const Object *ob_eval = DEG_get_evaluated_object(info.depsgraph, ob); + const Object *ob_eval = DEG_get_evaluated(info.depsgraph, ob); const Mesh *mesh_eval = BKE_object_get_evaluated_mesh(ob_eval); Mesh *new_mesh = mesh_eval ? BKE_mesh_copy_for_eval(*mesh_eval) : BKE_mesh_new_nomain(0, 0, 0, 0); @@ -3272,7 +3272,7 @@ static Object *convert_mesh_to_grease_pencil(Base &base, const float stroke_radius = float(thickness) / 2 * bke::greasepencil::LEGACY_RADIUS_CONVERSION_FACTOR; - Object *ob_eval = DEG_get_evaluated_object(info.depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(info.depsgraph, ob); const Mesh *mesh_eval = BKE_object_get_evaluated_mesh(ob_eval); VectorSet fill_colors; @@ -3346,7 +3346,7 @@ static Object *convert_curves_to_mesh(Base &base, ObjectConversionInfo &info, Ba Object *ob = base.object, *newob = nullptr; ob->flag |= OB_DONE; - Object *ob_eval = DEG_get_evaluated_object(info.depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(info.depsgraph, ob); bke::GeometrySet geometry; if (ob_eval->runtime->geometry_set_eval != nullptr) { geometry = *ob_eval->runtime->geometry_set_eval; @@ -3398,7 +3398,7 @@ static Object *convert_curves_to_grease_pencil(Base &base, Object *ob = base.object, *newob = nullptr; ob->flag |= OB_DONE; - Object *ob_eval = DEG_get_evaluated_object(info.depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(info.depsgraph, ob); bke::GeometrySet geometry; if (ob_eval->runtime->geometry_set_eval != nullptr) { geometry = *ob_eval->runtime->geometry_set_eval; @@ -3475,7 +3475,7 @@ static Object *convert_grease_pencil_to_mesh(Base &base, /* Mostly same as converting to OB_CURVES, the mesh will be converted from Curves afterwards. */ - Object *ob_eval = DEG_get_evaluated_object(info.depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(info.depsgraph, ob); bke::GeometrySet geometry; if (ob_eval->runtime->geometry_set_eval != nullptr) { geometry = *ob_eval->runtime->geometry_set_eval; @@ -3582,7 +3582,7 @@ static Object *convert_font_to_curve_legacy_generic(Object *ob, { Curve *cu = static_cast(newob->data); - Object *ob_eval = DEG_get_evaluated_object(info.depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(info.depsgraph, ob); BKE_vfont_to_curve_ex(ob_eval, static_cast(ob_eval->data), FO_EDIT, @@ -3853,7 +3853,7 @@ static Object *convert_mball_to_mesh(Base &base, id_us_min(&mb->id); /* Find the evaluated mesh of the basis metaball object. */ - Object *object_eval = DEG_get_evaluated_object(info.depsgraph, baseob); + Object *object_eval = DEG_get_evaluated(info.depsgraph, baseob); Mesh *mesh = BKE_mesh_new_from_object_to_bmain(info.bmain, info.depsgraph, object_eval, true); id_us_plus(&mesh->id); diff --git a/source/blender/editors/object/object_bake_api.cc b/source/blender/editors/object/object_bake_api.cc index 63ac5741b5f..ad26b8a1d91 100644 --- a/source/blender/editors/object/object_bake_api.cc +++ b/source/blender/editors/object/object_bake_api.cc @@ -1474,7 +1474,7 @@ static wmOperatorStatus bake(const BakeAPIRender *bkr, goto cleanup; } else { - ob_cage_eval = DEG_get_evaluated_object(depsgraph, ob_cage); + ob_cage_eval = DEG_get_evaluated(depsgraph, ob_cage); if (ob_cage_eval->id.orig_id != &ob_cage->id) { BKE_reportf(reports, RPT_ERROR, @@ -1502,7 +1502,7 @@ static wmOperatorStatus bake(const BakeAPIRender *bkr, /* Make sure depsgraph is up to date. */ BKE_scene_graph_update_tagged(depsgraph, bmain); - ob_low_eval = DEG_get_evaluated_object(depsgraph, ob_low); + ob_low_eval = DEG_get_evaluated(depsgraph, ob_low); /* get the mesh as it arrives in the renderer */ me_low_eval = bake_mesh_new_from_object(depsgraph, ob_low_eval, preserve_origindex); @@ -1596,7 +1596,7 @@ static wmOperatorStatus bake(const BakeAPIRender *bkr, continue; } - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob_iter); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob_iter); if (ob_eval->id.orig_id != &ob_iter->id) { BKE_reportf(reports, RPT_ERROR, diff --git a/source/blender/editors/object/object_data_transfer.cc b/source/blender/editors/object/object_data_transfer.cc index 360dd235324..18c9d668ed4 100644 --- a/source/blender/editors/object/object_data_transfer.cc +++ b/source/blender/editors/object/object_data_transfer.cc @@ -181,7 +181,7 @@ static const EnumPropertyItem *dt_layers_select_src_itemf(bContext *C, } else if (data_type == DT_TYPE_UV) { const Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); - const Object *ob_src_eval = DEG_get_evaluated_object(depsgraph, ob_src); + const Object *ob_src_eval = DEG_get_evaluated(depsgraph, ob_src); const Mesh *mesh_eval = BKE_object_get_evaluated_mesh_no_subsurf(ob_src_eval); if (!mesh_eval) { RNA_enum_item_end(&item, &totitem); @@ -201,7 +201,7 @@ static const EnumPropertyItem *dt_layers_select_src_itemf(bContext *C, } else if (data_type & DT_TYPE_VCOL_ALL) { const Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); - const Object *ob_src_eval = DEG_get_evaluated_object(depsgraph, ob_src); + const Object *ob_src_eval = DEG_get_evaluated(depsgraph, ob_src); const Mesh *mesh_eval = BKE_object_get_evaluated_mesh_no_subsurf(ob_src_eval); if (!mesh_eval) { RNA_enum_item_end(&item, &totitem); @@ -494,10 +494,10 @@ static wmOperatorStatus data_transfer_exec(bContext *C, wmOperator *op) } if (data_transfer_exec_is_object_valid(op, ob_src, ob_dst, reverse_transfer)) { - Object *ob_src_eval = DEG_get_evaluated_object(depsgraph, ob_src); + Object *ob_src_eval = DEG_get_evaluated(depsgraph, ob_src); if (space_transform) { - Object *ob_dst_eval = DEG_get_evaluated_object(depsgraph, ob_dst); + Object *ob_dst_eval = DEG_get_evaluated(depsgraph, ob_dst); BLI_SPACE_TRANSFORM_SETUP(space_transform, ob_dst_eval, ob_src_eval); } @@ -841,7 +841,7 @@ static wmOperatorStatus datalayout_transfer_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - Object *ob_src_eval = DEG_get_evaluated_object(depsgraph, ob_src); + Object *ob_src_eval = DEG_get_evaluated(depsgraph, ob_src); BKE_object_data_transfer_layout(depsgraph, ob_src_eval, @@ -872,7 +872,7 @@ static wmOperatorStatus datalayout_transfer_exec(bContext *C, wmOperator *op) layers_select_dst[fromto_idx] = layers_dst; } - Object *ob_src_eval = DEG_get_evaluated_object(depsgraph, ob_src); + Object *ob_src_eval = DEG_get_evaluated(depsgraph, ob_src); data_transfer_exec_preprocess_objects(C, op, ob_src, &ctx_objects, false); diff --git a/source/blender/editors/object/object_hook.cc b/source/blender/editors/object/object_hook.cc index 4a13a45adc7..e2916f0b230 100644 --- a/source/blender/editors/object/object_hook.cc +++ b/source/blender/editors/object/object_hook.cc @@ -594,7 +594,7 @@ static int add_hook_object(const bContext *C, */ /* (parentinv) */ Scene *scene_eval = DEG_get_evaluated_scene(depsgraph); - Object *object_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *object_eval = DEG_get_evaluated(depsgraph, ob); BKE_object_transform_copy(object_eval, ob); BKE_object_where_is_calc(depsgraph, scene_eval, object_eval); diff --git a/source/blender/editors/object/object_modes.cc b/source/blender/editors/object/object_modes.cc index db59aab947e..d4eb937c691 100644 --- a/source/blender/editors/object/object_modes.cc +++ b/source/blender/editors/object/object_modes.cc @@ -411,7 +411,7 @@ static void object_transfer_mode_reposition_view_pivot(ARegion *region, static void object_overlay_mode_transfer_animation_start(bContext *C, Object *ob_dst) { Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C); - Object *ob_dst_eval = DEG_get_evaluated_object(depsgraph, ob_dst); + Object *ob_dst_eval = DEG_get_evaluated(depsgraph, ob_dst); ob_dst_eval->runtime->overlay_mode_transfer_start_time = BLI_time_now_seconds(); } diff --git a/source/blender/editors/object/object_modifier.cc b/source/blender/editors/object/object_modifier.cc index 95287d80656..fe0e47a3e10 100644 --- a/source/blender/editors/object/object_modifier.cc +++ b/source/blender/editors/object/object_modifier.cc @@ -116,7 +116,7 @@ static void modifier_skin_customdata_delete(Object *ob); static void object_force_modifier_update_for_bind(Depsgraph *depsgraph, Object *ob) { Scene *scene_eval = DEG_get_evaluated_scene(depsgraph); - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob); BKE_object_eval_reset(ob_eval); if (ob->type == OB_MESH) { Mesh *mesh_eval = blender::bke::mesh_create_eval_final( @@ -911,7 +911,7 @@ static bool modifier_apply_shape(Main *bmain, Mesh *mesh_applied = create_applied_mesh_for_modifier(depsgraph, DEG_get_evaluated_scene(depsgraph), - DEG_get_evaluated_object(depsgraph, ob), + DEG_get_evaluated(depsgraph, ob), md_eval, true, false, @@ -950,7 +950,7 @@ static bool apply_grease_pencil_for_modifier(Depsgraph *depsgraph, using namespace bke; using namespace bke::greasepencil; const ModifierTypeInfo *mti = BKE_modifier_get_info(ModifierType(md_eval->type)); - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob); GreasePencil *grease_pencil_for_eval = ob_eval->runtime->data_orig ? reinterpret_cast( ob_eval->runtime->data_orig) : @@ -1028,7 +1028,7 @@ static bool apply_grease_pencil_for_modifier_all_keyframes(Depsgraph *depsgraph, scene->r.cfra = eval_frame; BKE_scene_graph_update_for_newframe(depsgraph); - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob); GreasePencil *grease_pencil_for_eval = ob_eval->runtime->data_orig ? reinterpret_cast( ob_eval->runtime->data_orig) : @@ -1112,7 +1112,7 @@ static bool modifier_apply_obdata(ReportList *reports, Mesh *mesh_applied = create_applied_mesh_for_modifier( depsgraph, DEG_get_evaluated_scene(depsgraph), - DEG_get_evaluated_object(depsgraph, ob), + DEG_get_evaluated(depsgraph, ob), md_eval, /* It's important not to apply virtual modifiers (e.g. shape-keys) because they're kept, * causing them to be applied twice, see: #97758. */ @@ -1139,7 +1139,7 @@ static bool modifier_apply_obdata(ReportList *reports, } } else if (ELEM(ob->type, OB_CURVES_LEGACY, OB_SURF)) { - Object *object_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *object_eval = DEG_get_evaluated(depsgraph, ob); Curve *curve = static_cast(ob->data); Curve *curve_eval = static_cast(object_eval->data); ModifierEvalContext mectx = {depsgraph, object_eval, MOD_APPLY_TO_ORIGINAL}; @@ -1163,7 +1163,7 @@ static bool modifier_apply_obdata(ReportList *reports, DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); } else if (ob->type == OB_LATTICE) { - Object *object_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *object_eval = DEG_get_evaluated(depsgraph, ob); Lattice *lattice = static_cast(ob->data); ModifierEvalContext mectx = {depsgraph, object_eval, MOD_APPLY_TO_ORIGINAL}; @@ -1309,7 +1309,7 @@ bool modifier_apply(Main *bmain, /* Get evaluated modifier, so object links pointer to evaluated data, * but still use original object it is applied to the original mesh. */ - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob); ModifierData *md_eval = (ob_eval) ? BKE_modifiers_findby_name(ob_eval, md->name) : md; Depsgraph *apply_depsgraph = depsgraph; @@ -1334,7 +1334,7 @@ bool modifier_apply(Main *bmain, apply_depsgraph = local_depsgraph; /* The evaluated object and modifier are now from the different dependency graph. */ - ob_eval = DEG_get_evaluated_object(local_depsgraph, ob); + ob_eval = DEG_get_evaluated(local_depsgraph, ob); md_eval = BKE_modifiers_findby_name(ob_eval, md->name); /* Force mode on the evaluated modifier, enforcing the modifier evaluation in the apply() @@ -2797,7 +2797,7 @@ static Object *modifier_skin_armature_create(Depsgraph *depsgraph, Main *bmain, const Span me_edges = mesh->edges(); Scene *scene_eval = DEG_get_evaluated_scene(depsgraph); - Object *ob_eval = DEG_get_evaluated_object(depsgraph, skin_ob); + Object *ob_eval = DEG_get_evaluated(depsgraph, skin_ob); const Mesh *me_eval_deform = blender::bke::mesh_get_eval_deform( depsgraph, scene_eval, ob_eval, &CD_MASK_BAREMESH); diff --git a/source/blender/editors/object/object_relations.cc b/source/blender/editors/object/object_relations.cc index 12fbf8c5271..c1bfd6325af 100644 --- a/source/blender/editors/object/object_relations.cc +++ b/source/blender/editors/object/object_relations.cc @@ -509,7 +509,7 @@ bool parent_set(ReportList *reports, Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); bPoseChannel *pchan = nullptr; bPoseChannel *pchan_eval = nullptr; - Object *parent_eval = DEG_get_evaluated_object(depsgraph, par); + Object *parent_eval = DEG_get_evaluated(depsgraph, par); /* Preconditions. */ if (ob == par) { @@ -865,7 +865,7 @@ static bool parent_set_vertex_parent(bContext *C, ParentingContext *parenting_co int tree_tot; Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); - Object *par_eval = DEG_get_evaluated_object(depsgraph, parenting_context->par); + Object *par_eval = DEG_get_evaluated(depsgraph, parenting_context->par); tree = BKE_object_as_kdtree(par_eval, &tree_tot); BLI_assert(tree != nullptr); diff --git a/source/blender/editors/object/object_transform.cc b/source/blender/editors/object/object_transform.cc index 6a3e4f71908..489ed8dce63 100644 --- a/source/blender/editors/object/object_transform.cc +++ b/source/blender/editors/object/object_transform.cc @@ -544,7 +544,7 @@ static void ignore_parent_tx(Main *bmain, Depsgraph *depsgraph, Scene *scene, Ob /* a change was made, adjust the children to compensate */ LISTBASE_FOREACH (Object *, ob_child, &bmain->objects) { if (ob_child->parent == ob) { - Object *ob_child_eval = DEG_get_evaluated_object(depsgraph, ob_child); + Object *ob_child_eval = DEG_get_evaluated(depsgraph, ob_child); BKE_object_apply_mat4(ob_child_eval, ob_child_eval->object_to_world().ptr(), true, false); invert_m4_m4(ob_child->parentinv, BKE_object_calc_parent(depsgraph, scene, ob_child_eval).ptr()); @@ -1076,7 +1076,7 @@ static wmOperatorStatus apply_objects_internal(bContext *C, } } - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob); BKE_object_transform_copy(ob_eval, ob); BKE_object_where_is_calc(depsgraph, scene, ob_eval); @@ -1113,7 +1113,7 @@ static wmOperatorStatus visual_transform_apply_exec(bContext *C, wmOperator * /* bool changed = false; CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects) { - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob); BKE_object_where_is_calc(depsgraph, scene, ob_eval); BKE_object_apply_mat4(ob_eval, ob_eval->object_to_world().ptr(), true, true); BKE_object_transform_copy(ob, ob_eval); @@ -1557,7 +1557,7 @@ static wmOperatorStatus object_origin_set_exec(bContext *C, wmOperator *op) arm->id.tag |= ID_TAG_DOIT; // do_inverse_offset = true; /* docenter_armature() handles this. */ - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob); BKE_object_transform_copy(ob_eval, ob); BKE_armature_copy_bone_transforms(static_cast(ob_eval->data), static_cast(ob->data)); @@ -1767,7 +1767,7 @@ static wmOperatorStatus object_origin_set_exec(bContext *C, wmOperator *op) add_v3_v3(ob->loc, centn); - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob); BKE_object_transform_copy(ob_eval, ob); BKE_object_where_is_calc(depsgraph, scene, ob_eval); if (ob->type == OB_ARMATURE) { @@ -1797,7 +1797,7 @@ static wmOperatorStatus object_origin_set_exec(bContext *C, wmOperator *op) centn, ob_other->object_to_world().ptr(), cent); /* omit translation part */ add_v3_v3(ob_other->loc, centn); - Object *ob_other_eval = DEG_get_evaluated_object(depsgraph, ob_other); + Object *ob_other_eval = DEG_get_evaluated(depsgraph, ob_other); BKE_object_transform_copy(ob_other_eval, ob_other); BKE_object_where_is_calc(depsgraph, scene, ob_other_eval); if (ob_other->type == OB_ARMATURE) { diff --git a/source/blender/editors/object/object_utils.cc b/source/blender/editors/object/object_utils.cc index ff0a986f6af..c75e8dd932e 100644 --- a/source/blender/editors/object/object_utils.cc +++ b/source/blender/editors/object/object_utils.cc @@ -269,13 +269,13 @@ void object_xform_skip_child_container_update_all(XFormObjectSkipChild_Container if (xf->mode == XFORM_OB_SKIP_CHILD_PARENT_IS_XFORM) { /* Parent is transformed, this isn't so compensate. */ - Object *ob_parent_eval = DEG_get_evaluated_object(depsgraph, ob->parent); + Object *ob_parent_eval = DEG_get_evaluated(depsgraph, ob->parent); mul_m4_m4m4(dmat, xf->parent_obmat_inv_orig, ob_parent_eval->object_to_world().ptr()); invert_m4(dmat); } else if (xf->mode == XFORM_OB_SKIP_CHILD_PARENT_IS_XFORM_INDIRECT) { /* Calculate parent matrix (from the root transform). */ - Object *ob_parent_recurse_eval = DEG_get_evaluated_object(depsgraph, xf->ob_parent_recurse); + Object *ob_parent_recurse_eval = DEG_get_evaluated(depsgraph, xf->ob_parent_recurse); float parent_recurse_obmat_inv[4][4]; invert_m4_m4(parent_recurse_obmat_inv, ob_parent_recurse_eval->object_to_world().ptr()); mul_m4_m4m4(dmat, xf->parent_recurse_obmat_orig, parent_recurse_obmat_inv); @@ -290,7 +290,7 @@ void object_xform_skip_child_container_update_all(XFormObjectSkipChild_Container else { BLI_assert(xf->mode == XFORM_OB_SKIP_CHILD_PARENT_APPLY); /* Transform this - without transform data. */ - Object *ob_parent_recurse_eval = DEG_get_evaluated_object(depsgraph, xf->ob_parent_recurse); + Object *ob_parent_recurse_eval = DEG_get_evaluated(depsgraph, xf->ob_parent_recurse); float parent_recurse_obmat_inv[4][4]; invert_m4_m4(parent_recurse_obmat_inv, ob_parent_recurse_eval->object_to_world().ptr()); mul_m4_m4m4(dmat, xf->parent_recurse_obmat_orig, parent_recurse_obmat_inv); @@ -372,7 +372,7 @@ void data_xform_container_update_all(XFormObjectData_Container *xds, continue; } - Object *ob_eval = DEG_get_evaluated_object(depsgraph, xf->ob); + Object *ob_eval = DEG_get_evaluated(depsgraph, xf->ob); float4x4 imat, dmat; invert_m4_m4(imat.ptr(), xf->obmat_orig); mul_m4_m4m4(dmat.ptr(), imat.ptr(), ob_eval->object_to_world().ptr()); diff --git a/source/blender/editors/object/object_visual_geometry_to_objects.cc b/source/blender/editors/object/object_visual_geometry_to_objects.cc index aad72d8d14a..36edd24fc31 100644 --- a/source/blender/editors/object/object_visual_geometry_to_objects.cc +++ b/source/blender/editors/object/object_visual_geometry_to_objects.cc @@ -455,7 +455,7 @@ static wmOperatorStatus visual_geometry_to_objects_exec(bContext *C, wmOperator GeometryToObjectsBuilder op(bmain); Vector all_new_top_level_objects; for (Object *src_ob_orig : selected_objects_orig) { - Object *src_ob_eval = DEG_get_evaluated_object(&depsgraph, src_ob_orig); + Object *src_ob_eval = DEG_get_evaluated(&depsgraph, src_ob_orig); bke::GeometrySet geometry_eval = bke::object_get_evaluated_geometry_set(*src_ob_eval); const ComponentObjects new_component_objects = op.get_objects_for_geometry(*src_ob_eval, geometry_eval); diff --git a/source/blender/editors/physics/dynamicpaint_ops.cc b/source/blender/editors/physics/dynamicpaint_ops.cc index fd39b64e170..70b7d635494 100644 --- a/source/blender/editors/physics/dynamicpaint_ops.cc +++ b/source/blender/editors/physics/dynamicpaint_ops.cc @@ -460,7 +460,7 @@ static wmOperatorStatus dynamicpaint_bake_exec(bContext *C, wmOperator *op) { Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); Object *ob_ = blender::ed::object::context_active_object(C); - Object *object_eval = DEG_get_evaluated_object(depsgraph, ob_); + Object *object_eval = DEG_get_evaluated(depsgraph, ob_); Scene *scene_eval = DEG_get_evaluated_scene(depsgraph); DynamicPaintSurface *surface; diff --git a/source/blender/editors/physics/particle_edit.cc b/source/blender/editors/physics/particle_edit.cc index e584b9f18d9..1c43e228a4d 100644 --- a/source/blender/editors/physics/particle_edit.cc +++ b/source/blender/editors/physics/particle_edit.cc @@ -532,7 +532,7 @@ static void PE_set_view3d_data(bContext *C, PEData *data) static bool PE_create_shape_tree(PEData *data, Object *shapeob) { - Object *shapeob_eval = DEG_get_evaluated_object(data->depsgraph, shapeob); + Object *shapeob_eval = DEG_get_evaluated(data->depsgraph, shapeob); const Mesh *mesh = BKE_object_get_evaluated_mesh(shapeob_eval); if (!mesh) { @@ -4168,7 +4168,7 @@ static int particle_intersect_mesh(Depsgraph *depsgraph, if (mesh == nullptr) { psys_disable_all(ob); - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob); mesh = BKE_object_get_evaluated_mesh(ob_eval); if (mesh == nullptr) { return 0; @@ -5304,7 +5304,7 @@ void PARTICLE_OT_shape_cut(wmOperatorType *ot) void PE_create_particle_edit( Depsgraph *depsgraph, Scene *scene, Object *ob, PointCache *cache, ParticleSystem *psys) { - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob); PTCacheEdit *edit; ParticleSystemModifierData *psmd = (psys) ? psys_get_modifier(ob, psys) : nullptr; ParticleSystemModifierData *psmd_eval = nullptr; @@ -5482,7 +5482,7 @@ void ED_object_particle_edit_mode_enter_ex(Depsgraph *depsgraph, Scene *scene, O /* Make sure pointer to the evaluated modifier data is up to date, * with possible changes applied when object was outside of the * edit mode. */ - Object *object_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *object_eval = DEG_get_evaluated(depsgraph, ob); edit->psmd_eval = (ParticleSystemModifierData *)BKE_modifiers_findby_name( object_eval, edit->psmd->modifier.name); recalc_emitter_field(depsgraph, ob, edit->psys); diff --git a/source/blender/editors/physics/particle_object.cc b/source/blender/editors/physics/particle_object.cc index f4e700a7047..5be8f139077 100644 --- a/source/blender/editors/physics/particle_object.cc +++ b/source/blender/editors/physics/particle_object.cc @@ -585,7 +585,7 @@ void PARTICLE_OT_dupliob_move_down(wmOperatorType *ot) static void disconnect_hair(Depsgraph *depsgraph, Scene *scene, Object *ob, ParticleSystem *psys) { - Object *object_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *object_eval = DEG_get_evaluated(depsgraph, ob); ParticleSystem *psys_eval = psys_eval_get(depsgraph, ob, psys); ParticleSystemModifierData *psmd_eval = psys_get_modifier(object_eval, psys_eval); ParticleEditSettings *pset = PE_settings(scene); @@ -696,7 +696,7 @@ static bool remap_hair_emitter(Depsgraph *depsgraph, bool from_global, bool to_global) { - Object *object_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *object_eval = DEG_get_evaluated(depsgraph, ob); ParticleSystem *psys_eval = psys_eval_get(depsgraph, ob, psys); ParticleSystemModifierData *target_psmd = psys_get_modifier(object_eval, psys_eval); ParticleData *pa, *tpa; diff --git a/source/blender/editors/physics/rigidbody_object.cc b/source/blender/editors/physics/rigidbody_object.cc index f63dc51008c..1dcd3d50153 100644 --- a/source/blender/editors/physics/rigidbody_object.cc +++ b/source/blender/editors/physics/rigidbody_object.cc @@ -480,7 +480,7 @@ static wmOperatorStatus rigidbody_objects_calc_mass_exec(bContext *C, wmOperator /* mass is calculated from the approximate volume of the object, * and the density of the material we're simulating */ - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob); BKE_rigidbody_calc_volume(ob_eval, &volume); mass = volume * density; diff --git a/source/blender/editors/render/render_preview.cc b/source/blender/editors/render/render_preview.cc index 77bc699803c..dc9150ecb41 100644 --- a/source/blender/editors/render/render_preview.cc +++ b/source/blender/editors/render/render_preview.cc @@ -891,21 +891,20 @@ static void object_preview_render(IconPreview *preview, IconPreviewSize *preview /* Enable shadows, makes it a bit easier to see the shape. */ shading.flag |= V3D_SHADING_SHADOW; - ImBuf *ibuf = ED_view3d_draw_offscreen_imbuf_simple( - depsgraph, - DEG_get_evaluated_scene(depsgraph), - &shading, - OB_TEXTURE, - DEG_get_evaluated_object(depsgraph, scene->camera), - preview_sized->sizex, - preview_sized->sizey, - IB_byte_data, - V3D_OFSDRAW_OVERRIDE_SCENE_SETTINGS, - R_ALPHAPREMUL, - nullptr, - nullptr, - nullptr, - err_out); + ImBuf *ibuf = ED_view3d_draw_offscreen_imbuf_simple(depsgraph, + DEG_get_evaluated_scene(depsgraph), + &shading, + OB_TEXTURE, + DEG_get_evaluated(depsgraph, scene->camera), + preview_sized->sizex, + preview_sized->sizey, + IB_byte_data, + V3D_OFSDRAW_OVERRIDE_SCENE_SETTINGS, + R_ALPHAPREMUL, + nullptr, + nullptr, + nullptr, + err_out); /* TODO: color-management? */ if (ibuf) { diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc index 570b809d4f7..2116e038867 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc @@ -127,7 +127,7 @@ struct AddOperationExecutor { return; } - surface_ob_eval_ = DEG_get_evaluated_object(ctx_.depsgraph, &surface_ob_orig); + surface_ob_eval_ = DEG_get_evaluated(ctx_.depsgraph, &surface_ob_orig); if (surface_ob_eval_ == nullptr) { return; } diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc b/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc index baca160979d..ad6553d8deb 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc @@ -179,7 +179,7 @@ std::optional sample_curves_3d_brush(const Depsgraph &depsgraph, const Curves &curves_id = *static_cast(curves_object.data); const CurvesGeometry &curves = curves_id.geometry.wrap(); Object *surface_object = curves_id.surface; - Object *surface_object_eval = DEG_get_evaluated_object(&depsgraph, surface_object); + Object *surface_object_eval = DEG_get_evaluated(&depsgraph, surface_object); float3 center_ray_start_wo, center_ray_end_wo; ED_view3d_win_to_segment_clipped( diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_density.cc b/source/blender/editors/sculpt_paint/curves_sculpt_density.cc index 7e75d41e586..6fc5e30ed82 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_density.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_density.cc @@ -119,7 +119,7 @@ struct DensityAddOperationExecutor { return; } - surface_ob_eval_ = DEG_get_evaluated_object(ctx_.depsgraph, surface_ob_orig_); + surface_ob_eval_ = DEG_get_evaluated(ctx_.depsgraph, surface_ob_orig_); if (surface_ob_eval_ == nullptr) { return; } @@ -550,7 +550,7 @@ struct DensitySubtractOperationExecutor { } surface_orig_ = static_cast(surface_ob_orig_->data); - surface_ob_eval_ = DEG_get_evaluated_object(ctx_.depsgraph, surface_ob_orig_); + surface_ob_eval_ = DEG_get_evaluated(ctx_.depsgraph, surface_ob_orig_); if (surface_ob_eval_ == nullptr) { return; } @@ -823,7 +823,7 @@ static bool use_add_density_mode(const BrushStrokeMode brush_mode, if (surface_ob_orig == nullptr) { return true; } - Object *surface_ob_eval = DEG_get_evaluated_object(&depsgraph, surface_ob_orig); + Object *surface_ob_eval = DEG_get_evaluated(&depsgraph, surface_ob_orig); if (surface_ob_eval == nullptr) { return true; } diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc b/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc index a1a25558cf3..9f85abf9708 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc @@ -1028,7 +1028,7 @@ static wmOperatorStatus min_distance_edit_invoke(bContext *C, wmOperator *op, co Object &curves_ob_orig = *CTX_data_active_object(C); Curves &curves_id_orig = *static_cast(curves_ob_orig.data); Object &surface_ob_orig = *curves_id_orig.surface; - Object *surface_ob_eval = DEG_get_evaluated_object(depsgraph, &surface_ob_orig); + Object *surface_ob_eval = DEG_get_evaluated(depsgraph, &surface_ob_orig); if (surface_ob_eval == nullptr) { return OPERATOR_CANCELLED; } diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc b/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc index 00c10af861b..73ff2b6c5b3 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc @@ -172,7 +172,7 @@ struct SlideOperationExecutor { report_missing_uv_map_on_original_surface(stroke_extension.reports); return; } - surface_ob_eval_ = DEG_get_evaluated_object(ctx_.depsgraph, surface_ob_orig_); + surface_ob_eval_ = DEG_get_evaluated(ctx_.depsgraph, surface_ob_orig_); if (surface_ob_eval_ == nullptr) { return; } diff --git a/source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc b/source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc index 869feb45288..0ad91a2e839 100644 --- a/source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc +++ b/source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc @@ -1844,7 +1844,7 @@ static wmOperatorStatus grease_pencil_erase_lasso_exec(bContext *C, wmOperator * const Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C); const ARegion *region = CTX_wm_region(C); Object *object = CTX_data_active_object(C); - const Object *ob_eval = DEG_get_evaluated_object(depsgraph, object); + const Object *ob_eval = DEG_get_evaluated(depsgraph, object); GreasePencil &grease_pencil = *static_cast(object->data); const Array lasso = WM_gesture_lasso_path_to_array(C, op); @@ -1963,7 +1963,7 @@ static wmOperatorStatus grease_pencil_erase_box_exec(bContext *C, wmOperator *op const Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C); const ARegion *region = CTX_wm_region(C); Object *object = CTX_data_active_object(C); - const Object *ob_eval = DEG_get_evaluated_object(depsgraph, object); + const Object *ob_eval = DEG_get_evaluated(depsgraph, object); GreasePencil &grease_pencil = *static_cast(object->data); const Bounds box_bounds = WM_operator_properties_border_to_bounds(op); diff --git a/source/blender/editors/sculpt_paint/grease_pencil_erase.cc b/source/blender/editors/sculpt_paint/grease_pencil_erase.cc index 5d80804dd7b..51f833af081 100644 --- a/source/blender/editors/sculpt_paint/grease_pencil_erase.cc +++ b/source/blender/editors/sculpt_paint/grease_pencil_erase.cc @@ -918,7 +918,7 @@ struct EraseOperationExecutor { Depsgraph *depsgraph = CTX_data_depsgraph_pointer(&C); ARegion *region = CTX_wm_region(&C); Object *obact = CTX_data_active_object(&C); - Object *ob_eval = DEG_get_evaluated_object(depsgraph, obact); + Object *ob_eval = DEG_get_evaluated(depsgraph, obact); Paint *paint = &scene->toolsettings->gp_paint->paint; Brush *brush = BKE_paint_brush(paint); diff --git a/source/blender/editors/sculpt_paint/grease_pencil_fill.cc b/source/blender/editors/sculpt_paint/grease_pencil_fill.cc index 5a5d31bf5a2..2d62988e7ed 100644 --- a/source/blender/editors/sculpt_paint/grease_pencil_fill.cc +++ b/source/blender/editors/sculpt_paint/grease_pencil_fill.cc @@ -950,8 +950,7 @@ static auto fit_strokes_to_view(const ViewContext &view_context, return std::make_tuple(float2(1.0f), float2(0.0f), min_image_size, float3x3::identity()); case FillToolFitMethod::FitToView: { - const Object &object_eval = *DEG_get_evaluated_object(view_context.depsgraph, - view_context.obact); + const Object &object_eval = *DEG_get_evaluated(view_context.depsgraph, view_context.obact); /* Zoom and offset based on bounds, to fit all strokes within the render. */ const std::optional> boundary_bounds = get_boundary_bounds( *view_context.region, @@ -1133,7 +1132,7 @@ bke::CurvesGeometry fill_strokes(const ViewContext &view_context, Object &object = *view_context.obact; BLI_assert(object.type == OB_GREASE_PENCIL); - const Object &object_eval = *DEG_get_evaluated_object(&depsgraph, &object); + const Object &object_eval = *DEG_get_evaluated(&depsgraph, &object); /* Zoom and offset based on bounds, to fit all strokes within the render. */ const bool uniform_zoom = true; diff --git a/source/blender/editors/sculpt_paint/grease_pencil_paint.cc b/source/blender/editors/sculpt_paint/grease_pencil_paint.cc index f8723cd3230..807ae3f0e47 100644 --- a/source/blender/editors/sculpt_paint/grease_pencil_paint.cc +++ b/source/blender/editors/sculpt_paint/grease_pencil_paint.cc @@ -1064,7 +1064,7 @@ void PaintOperation::on_stroke_begin(const bContext &C, const InputSample &start View3D *view3d = CTX_wm_view3d(&C); Scene *scene = CTX_data_scene(&C); Object *object = CTX_data_active_object(&C); - Object *eval_object = DEG_get_evaluated_object(depsgraph, object); + Object *eval_object = DEG_get_evaluated(depsgraph, object); GreasePencil *grease_pencil = static_cast(object->data); Paint *paint = &scene->toolsettings->gp_paint->paint; diff --git a/source/blender/editors/sculpt_paint/grease_pencil_paint_common.cc b/source/blender/editors/sculpt_paint/grease_pencil_paint_common.cc index 291458621d8..604ca3926ba 100644 --- a/source/blender/editors/sculpt_paint/grease_pencil_paint_common.cc +++ b/source/blender/editors/sculpt_paint/grease_pencil_paint_common.cc @@ -288,7 +288,7 @@ GreasePencilStrokeParams GreasePencilStrokeParams::from_context( const float multi_frame_falloff, bke::greasepencil::Drawing &drawing) { - Object &ob_eval = *DEG_get_evaluated_object(&depsgraph, &object); + Object &ob_eval = *DEG_get_evaluated(&depsgraph, &object); GreasePencil &grease_pencil = *static_cast(object.data); const bke::greasepencil::Layer &layer = grease_pencil.layer(layer_index); @@ -459,7 +459,7 @@ void GreasePencilStrokeOperationCommon::foreach_editable_drawing_with_automask( ARegion ®ion = *CTX_wm_region(&C); RegionView3D &rv3d = *CTX_wm_region_view3d(&C); Object &object = *CTX_data_active_object(&C); - Object &object_eval = *DEG_get_evaluated_object(&depsgraph, &object); + Object &object_eval = *DEG_get_evaluated(&depsgraph, &object); GreasePencil &grease_pencil = *static_cast(object.data); std::atomic changed = false; @@ -540,7 +540,7 @@ void GreasePencilStrokeOperationCommon::foreach_editable_drawing( ARegion ®ion = *CTX_wm_region(&C); RegionView3D &rv3d = *CTX_wm_region_view3d(&C); Object &object = *CTX_data_active_object(&C); - Object &object_eval = *DEG_get_evaluated_object(&depsgraph, &object); + Object &object_eval = *DEG_get_evaluated(&depsgraph, &object); GreasePencil &grease_pencil = *static_cast(object.data); bool changed = false; diff --git a/source/blender/editors/sculpt_paint/grease_pencil_sculpt_grab.cc b/source/blender/editors/sculpt_paint/grease_pencil_sculpt_grab.cc index 9d5f887e3fb..8ca907fb3b7 100644 --- a/source/blender/editors/sculpt_paint/grease_pencil_sculpt_grab.cc +++ b/source/blender/editors/sculpt_paint/grease_pencil_sculpt_grab.cc @@ -76,7 +76,7 @@ void GrabOperation::foreach_grabbed_drawing( ARegion ®ion = *CTX_wm_region(&C); RegionView3D &rv3d = *CTX_wm_region_view3d(&C); Object &object = *CTX_data_active_object(&C); - Object &object_eval = *DEG_get_evaluated_object(&depsgraph, &object); + Object &object_eval = *DEG_get_evaluated(&depsgraph, &object); GreasePencil &grease_pencil = *static_cast(object.data); bool changed = false; @@ -123,7 +123,7 @@ void GrabOperation::on_stroke_begin(const bContext &C, const InputSample &start_ Brush &brush = *BKE_paint_brush(&paint); const Depsgraph &depsgraph = *CTX_data_depsgraph_pointer(&C); Object &ob_orig = *CTX_data_active_object(&C); - Object &ob_eval = *DEG_get_evaluated_object(&depsgraph, &ob_orig); + Object &ob_eval = *DEG_get_evaluated(&depsgraph, &ob_orig); GreasePencil &grease_pencil = *static_cast(ob_orig.data); init_brush(brush); diff --git a/source/blender/editors/sculpt_paint/grease_pencil_tint.cc b/source/blender/editors/sculpt_paint/grease_pencil_tint.cc index b9361f8f1a2..19b9169c3fd 100644 --- a/source/blender/editors/sculpt_paint/grease_pencil_tint.cc +++ b/source/blender/editors/sculpt_paint/grease_pencil_tint.cc @@ -117,7 +117,7 @@ void TintOperation::on_stroke_begin(const bContext &C, const InputSample & /*sta ARegion *region = CTX_wm_region(&C); Depsgraph *depsgraph = CTX_data_depsgraph_pointer(&C); - Object *ob_eval = DEG_get_evaluated_object(depsgraph, obact); + Object *ob_eval = DEG_get_evaluated(depsgraph, obact); screen_positions_per_drawing_.reinitialize(drawings_.size()); diff --git a/source/blender/editors/sculpt_paint/grease_pencil_weight_paint.hh b/source/blender/editors/sculpt_paint/grease_pencil_weight_paint.hh index 3114bd8f888..4f61d73194b 100644 --- a/source/blender/editors/sculpt_paint/grease_pencil_weight_paint.hh +++ b/source/blender/editors/sculpt_paint/grease_pencil_weight_paint.hh @@ -199,7 +199,7 @@ class WeightPaintOperation : public GreasePencilStrokeOperation { const int frame_group) { const Depsgraph *depsgraph = CTX_data_depsgraph_pointer(&C); - const Object *ob_eval = DEG_get_evaluated_object(depsgraph, this->object); + const Object *ob_eval = DEG_get_evaluated(depsgraph, this->object); const RegionView3D *rv3d = CTX_wm_region_view3d(&C); const ARegion *region = CTX_wm_region(&C); diff --git a/source/blender/editors/sculpt_paint/paint_image.cc b/source/blender/editors/sculpt_paint/paint_image.cc index 5692d96e652..7799df8c787 100644 --- a/source/blender/editors/sculpt_paint/paint_image.cc +++ b/source/blender/editors/sculpt_paint/paint_image.cc @@ -939,7 +939,7 @@ void ED_object_texture_paint_mode_enter_ex(Main &bmain, BKE_scene_graph_evaluated_ensure(&depsgraph, &bmain); /* Set pivot to bounding box center. */ - Object *ob_eval = DEG_get_evaluated_object(&depsgraph, &ob); + Object *ob_eval = DEG_get_evaluated(&depsgraph, &ob); paint_init_pivot(ob_eval ? ob_eval : &ob, &scene); WM_main_add_notifier(NC_SCENE | ND_MODE, &scene); diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.cc b/source/blender/editors/sculpt_paint/paint_image_proj.cc index 635dbc74b41..78807cdfe2f 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.cc +++ b/source/blender/editors/sculpt_paint/paint_image_proj.cc @@ -3759,7 +3759,7 @@ static void proj_paint_state_viewport_init(ProjPaintState *ps, const char symmet invert_m4_m4(viewinv, viewmat); } else if (ps->source == PROJ_SRC_IMAGE_CAM) { - Object *cam_ob_eval = DEG_get_evaluated_object(ps->depsgraph, ps->scene->camera); + Object *cam_ob_eval = DEG_get_evaluated(ps->depsgraph, ps->scene->camera); CameraParams params; /* viewmat & viewinv */ @@ -4043,7 +4043,7 @@ static bool proj_paint_state_mesh_eval_init(const bContext *C, ProjPaintState *p Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); Object *ob = ps->ob; - const Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + const Object *ob_eval = DEG_get_evaluated(depsgraph, ob); ps->mesh_eval = BKE_object_get_evaluated_mesh(ob_eval); if (!ps->mesh_eval) { return false; diff --git a/source/blender/editors/sculpt_paint/paint_utils.cc b/source/blender/editors/sculpt_paint/paint_utils.cc index 196e984508e..3c075ceb684 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.cc +++ b/source/blender/editors/sculpt_paint/paint_utils.cc @@ -338,7 +338,7 @@ void paint_sample_color( ViewLayer *view_layer = CTX_data_view_layer(C); BKE_view_layer_synced_ensure(scene, view_layer); Object *ob = BKE_view_layer_active_object_get(view_layer); - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob); ImagePaintSettings *imapaint = &scene->toolsettings->imapaint; bool use_material = (imapaint->mode == IMAGEPAINT_MODE_MATERIAL); diff --git a/source/blender/editors/sculpt_paint/paint_vertex_proj.cc b/source/blender/editors/sculpt_paint/paint_vertex_proj.cc index 2fad32aaed2..ead5cc19d39 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_proj.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex_proj.cc @@ -78,7 +78,7 @@ static void vpaint_proj_dm_map_cosnos_init(Depsgraph &depsgraph, Object &ob, VertProjHandle &vp_handle) { - const Object *ob_eval = DEG_get_evaluated_object(&depsgraph, &ob); + const Object *ob_eval = DEG_get_evaluated(&depsgraph, &ob); const Mesh *mesh_eval = BKE_object_get_evaluated_mesh(ob_eval); vp_handle.vert_normals.fill(blender::float3(0)); @@ -136,7 +136,7 @@ static void vpaint_proj_dm_map_cosnos_update(Depsgraph *depsgraph, Object &ob = *vp_handle->ob; - const Object *ob_eval = DEG_get_evaluated_object(depsgraph, &ob); + const Object *ob_eval = DEG_get_evaluated(depsgraph, &ob); const Mesh *mesh_eval = BKE_object_get_evaluated_mesh(ob_eval); /* quick sanity check - we shouldn't have to run this if there are no modifiers */ diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.cc b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.cc index f6e819855b5..b050c82c4fe 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.cc @@ -829,7 +829,7 @@ static wmOperatorStatus paint_weight_gradient_exec(bContext *C, wmOperator *op) ED_view3d_init_mats_rv3d(ob, static_cast(region->regiondata)); - const Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + const Object *ob_eval = DEG_get_evaluated(depsgraph, ob); const Mesh *mesh_eval = BKE_object_get_evaluated_mesh(ob_eval); if (data.is_init) { data.vert_visit = BLI_BITMAP_NEW(mesh->verts_num, __func__); diff --git a/source/blender/editors/space_clip/tracking_ops_orient.cc b/source/blender/editors/space_clip/tracking_ops_orient.cc index 8897582f4b6..8ccb7a77d46 100644 --- a/source/blender/editors/space_clip/tracking_ops_orient.cc +++ b/source/blender/editors/space_clip/tracking_ops_orient.cc @@ -471,7 +471,7 @@ static wmOperatorStatus set_plane_exec(bContext *C, wmOperator *op) Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); Scene *scene_eval = DEG_get_evaluated_scene(depsgraph); - Object *object_eval = DEG_get_evaluated_object(depsgraph, object); + Object *object_eval = DEG_get_evaluated(depsgraph, object); BKE_object_transform_copy(object_eval, object); BKE_object_where_is_calc(depsgraph, scene_eval, object_eval); BKE_object_transform_copy(object, object_eval); diff --git a/source/blender/editors/space_node/space_node.cc b/source/blender/editors/space_node/space_node.cc index 7084b3d0592..96400e4a1ad 100644 --- a/source/blender/editors/space_node/space_node.cc +++ b/source/blender/editors/space_node/space_node.cc @@ -357,8 +357,7 @@ bool node_editor_is_for_geometry_nodes_modifier(const SpaceNode &snode, if (!object_and_modifier) { return false; } - const Object *object_orig = DEG_is_original_object(&object) ? &object : - DEG_get_original(&object); + const Object *object_orig = DEG_is_original(&object) ? &object : DEG_get_original(&object); if (object_and_modifier->object != object_orig) { return false; } diff --git a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc index adc0578b24a..026cbc488c4 100644 --- a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc +++ b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc @@ -318,7 +318,7 @@ Object *spreadsheet_get_object_eval(const SpaceSpreadsheet *sspreadsheet, return nullptr; } - Object *object_eval = DEG_get_evaluated_object(depsgraph, object_orig); + Object *object_eval = DEG_get_evaluated(depsgraph, object_orig); if (object_eval == nullptr) { return nullptr; } diff --git a/source/blender/editors/space_view3d/view3d_draw.cc b/source/blender/editors/space_view3d/view3d_draw.cc index b79b816e74b..00b9a1fed22 100644 --- a/source/blender/editors/space_view3d/view3d_draw.cc +++ b/source/blender/editors/space_view3d/view3d_draw.cc @@ -390,7 +390,7 @@ static void view3d_camera_border(const Scene *scene, { CameraParams params; rctf rect_view, rect_camera; - Object *camera_eval = DEG_get_evaluated_object(depsgraph, v3d->camera); + Object *camera_eval = DEG_get_evaluated(depsgraph, v3d->camera); /* get viewport viewplane */ BKE_camera_params_init(¶ms); @@ -2047,7 +2047,7 @@ ImBuf *ED_view3d_draw_offscreen_imbuf(Depsgraph *depsgraph, if (rv3d->persp == RV3D_CAMOB && v3d->camera) { CameraParams params; Object *camera = BKE_camera_multiview_render(scene, v3d->camera, viewname); - const Object *camera_eval = DEG_get_evaluated_object(depsgraph, camera); + const Object *camera_eval = DEG_get_evaluated(depsgraph, camera); BKE_camera_params_init(¶ms); /* fallback for non camera objects */ @@ -2227,7 +2227,7 @@ ImBuf *ED_view3d_draw_offscreen_imbuf_simple(Depsgraph *depsgraph, { CameraParams params; - const Object *view_camera_eval = DEG_get_evaluated_object( + const Object *view_camera_eval = DEG_get_evaluated( depsgraph, BKE_camera_multiview_render(scene, v3d.camera, viewname)); BKE_camera_params_init(¶ms); @@ -2307,7 +2307,7 @@ static void validate_object_select_id(Depsgraph *depsgraph, if (v3d->runtime.flag & V3D_RUNTIME_DEPTHBUF_OVERRIDDEN) { return; } - Object *obact_eval = DEG_get_evaluated_object(depsgraph, obact); + Object *obact_eval = DEG_get_evaluated(depsgraph, obact); BLI_assert(region->regiontype == RGN_TYPE_WINDOW); UNUSED_VARS_NDEBUG(region); diff --git a/source/blender/editors/space_view3d/view3d_edit.cc b/source/blender/editors/space_view3d/view3d_edit.cc index a0efb777eea..7981d803cfd 100644 --- a/source/blender/editors/space_view3d/view3d_edit.cc +++ b/source/blender/editors/space_view3d/view3d_edit.cc @@ -129,7 +129,7 @@ static wmOperatorStatus view_lock_to_active_exec(bContext *C, wmOperator * /*op* if (obact && obact->type == OB_ARMATURE) { if (obact->mode & OB_MODE_POSE) { Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); - Object *obact_eval = DEG_get_evaluated_object(depsgraph, obact); + Object *obact_eval = DEG_get_evaluated(depsgraph, obact); bPoseChannel *pcham_act = BKE_pose_channel_active_if_bonecoll_visible(obact_eval); if (pcham_act) { STRNCPY(v3d->ob_center_bone, pcham_act->name); diff --git a/source/blender/editors/space_view3d/view3d_gizmo_geometry_nodes.cc b/source/blender/editors/space_view3d/view3d_gizmo_geometry_nodes.cc index 9cfddf22707..ae2268a2f97 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_geometry_nodes.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_geometry_nodes.cc @@ -965,8 +965,7 @@ static void WIDGETGROUP_geometry_nodes_refresh(const bContext *C, wmGizmoGroup * /* Can't create gizmos without any logged data. */ return; } - Object *object_eval = DEG_get_evaluated_object(depsgraph, - const_cast(&object_orig)); + Object *object_eval = DEG_get_evaluated(depsgraph, const_cast(&object_orig)); if (!object_eval) { return; } diff --git a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc index 8fcc60e1189..653f7b107b0 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc @@ -241,7 +241,7 @@ static int gizmo_preselect_elem_test_select(bContext *C, wmGizmo *gz, const int { Object *ob = gz_ele->bases[gz_ele->base_index]->object; const Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); - const Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + const Object *ob_eval = DEG_get_evaluated(depsgraph, ob); const Mesh *mesh_eval = BKE_object_get_editmesh_eval_cage(ob_eval); if (BKE_mesh_wrapper_vert_len(mesh_eval) == bm->totvert) { vert_positions = BKE_mesh_wrapper_vert_coords(mesh_eval); @@ -406,7 +406,7 @@ static int gizmo_preselect_edgering_test_select(bContext *C, wmGizmo *gz, const if (best.eed) { Object *ob = gz_ring->bases[gz_ring->base_index]->object; Scene *scene_eval = DEG_get_evaluated(vc.depsgraph, vc.scene); - Object *ob_eval = DEG_get_evaluated_object(vc.depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(vc.depsgraph, ob); BMEditMesh *em_eval = BKE_editmesh_from_object(ob_eval); /* Re-allocate coords each update isn't ideal, however we can't be sure * the mesh hasn't been edited since last update. */ diff --git a/source/blender/editors/space_view3d/view3d_iterators.cc b/source/blender/editors/space_view3d/view3d_iterators.cc index 5ec1f823af9..596d07d6242 100644 --- a/source/blender/editors/space_view3d/view3d_iterators.cc +++ b/source/blender/editors/space_view3d/view3d_iterators.cc @@ -293,7 +293,7 @@ void meshobject_foreachScreenVert(const ViewContext *vc, BLI_assert((clip_flag & V3D_PROJ_TEST_CLIP_CONTENT) == 0); foreachScreenObjectVert_userData data; - const Object *ob_eval = DEG_get_evaluated_object(vc->depsgraph, vc->obact); + const Object *ob_eval = DEG_get_evaluated(vc->depsgraph, vc->obact); const Mesh *mesh = BKE_object_get_evaluated_mesh(ob_eval); const bke::AttributeAccessor attributes = mesh->attributes(); @@ -844,7 +844,7 @@ void pose_foreachScreenBone(const ViewContext *vc, { /* Almost _exact_ copy of #armature_foreachScreenBone */ - const Object *ob_eval = DEG_get_evaluated_object(vc->depsgraph, vc->obact); + const Object *ob_eval = DEG_get_evaluated(vc->depsgraph, vc->obact); const bArmature *arm_eval = static_cast(ob_eval->data); bPose *pose = vc->obact->pose; diff --git a/source/blender/editors/space_view3d/view3d_navigate.cc b/source/blender/editors/space_view3d/view3d_navigate.cc index 48a1af86627..10df013fbbe 100644 --- a/source/blender/editors/space_view3d/view3d_navigate.cc +++ b/source/blender/editors/space_view3d/view3d_navigate.cc @@ -981,8 +981,7 @@ void axis_set_view(bContext *C, dist = rv3d->dist; /* so we animate _from_ the camera location */ - Object *camera_eval = DEG_get_evaluated_object(CTX_data_ensure_evaluated_depsgraph(C), - v3d->camera); + Object *camera_eval = DEG_get_evaluated(CTX_data_ensure_evaluated_depsgraph(C), v3d->camera); ED_view3d_from_object(camera_eval, rv3d->ofs, nullptr, &rv3d->dist, nullptr); V3D_SmoothParams sview = {nullptr}; diff --git a/source/blender/editors/space_view3d/view3d_navigate_smoothview.cc b/source/blender/editors/space_view3d/view3d_navigate_smoothview.cc index 49c7465d4d9..1e7f842c27b 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_smoothview.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_smoothview.cc @@ -275,7 +275,7 @@ void ED_view3d_smooth_view_ex( } if (sview->camera) { - Object *ob_camera_eval = DEG_get_evaluated_object(depsgraph, sview->camera); + Object *ob_camera_eval = DEG_get_evaluated(depsgraph, sview->camera); if (sview->ofs != nullptr) { sms.dst.dist = ED_view3d_offset_distance( ob_camera_eval->object_to_world().ptr(), sview->ofs, VIEW3D_DIST_FALLBACK); @@ -301,7 +301,7 @@ void ED_view3d_smooth_view_ex( /* Original values. */ if (sview->camera_old) { - Object *ob_camera_old_eval = DEG_get_evaluated_object(depsgraph, sview->camera_old); + Object *ob_camera_old_eval = DEG_get_evaluated(depsgraph, sview->camera_old); if (sview->ofs != nullptr) { sms.src.dist = ED_view3d_offset_distance( ob_camera_old_eval->object_to_world().ptr(), sview->ofs, 0.0f); @@ -329,7 +329,7 @@ void ED_view3d_smooth_view_ex( /* Ensure it shows correct. */ if (sms.to_camera) { /* Use orthographic if we move from an orthographic view to an orthographic camera. */ - Object *ob_camera_eval = DEG_get_evaluated_object(depsgraph, sview->camera); + Object *ob_camera_eval = DEG_get_evaluated(depsgraph, sview->camera); rv3d->persp = ((rv3d->is_persp == false) && (ob_camera_eval->type == OB_CAMERA) && (static_cast(ob_camera_eval->data)->type == CAM_ORTHO)) ? RV3D_ORTHO : diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_all.cc b/source/blender/editors/space_view3d/view3d_navigate_view_all.cc index 015f0f4e572..19facfa154d 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_all.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_all.cc @@ -388,7 +388,7 @@ bool view3d_calc_point_in_selected_bounds(Depsgraph *depsgraph, continue; } Object *ob = base->object; - BLI_assert(!DEG_is_original_id(&ob->id)); + BLI_assert(!DEG_is_original(ob)); float3 min, max; view3d_object_calc_minmax(depsgraph, scene, ob, false, min, max); diff --git a/source/blender/editors/space_view3d/view3d_select.cc b/source/blender/editors/space_view3d/view3d_select.cc index 305f1fc89a2..362c102b666 100644 --- a/source/blender/editors/space_view3d/view3d_select.cc +++ b/source/blender/editors/space_view3d/view3d_select.cc @@ -1171,7 +1171,7 @@ static bool do_lasso_select_grease_pencil(const ViewContext *vc, { using namespace blender; Object *object = (vc->obedit ? vc->obedit : vc->obact); - const Object *ob_eval = DEG_get_evaluated_object(vc->depsgraph, object); + const Object *ob_eval = DEG_get_evaluated(vc->depsgraph, object); const GreasePencil &grease_pencil = *static_cast(object->data); const bke::AttrDomain selection_domain = ED_grease_pencil_selection_domain_get( vc->scene->toolsettings, object); @@ -3337,7 +3337,7 @@ static bool ed_grease_pencil_select_pick(bContext *C, Object *object = (vc.obedit ? vc.obedit : vc.obact); /* Collect editable drawings. */ - const Object *ob_eval = DEG_get_evaluated_object(vc.depsgraph, object); + const Object *ob_eval = DEG_get_evaluated(vc.depsgraph, object); GreasePencil &grease_pencil = *static_cast(object->data); const Vector drawings = ed::greasepencil::retrieve_editable_drawings(*vc.scene, grease_pencil); @@ -4404,7 +4404,7 @@ static bool do_grease_pencil_box_select(const ViewContext *vc, { using namespace blender; Object *object = (vc->obedit ? vc->obedit : vc->obact); - const Object *ob_eval = DEG_get_evaluated_object(vc->depsgraph, object); + const Object *ob_eval = DEG_get_evaluated(vc->depsgraph, object); const GreasePencil &grease_pencil = *static_cast(object->data); const bke::AttrDomain selection_domain = ED_grease_pencil_selection_domain_get( vc->scene->toolsettings, object); @@ -5283,7 +5283,7 @@ static bool grease_pencil_circle_select(const ViewContext *vc, { using namespace blender; Object *object = (vc->obedit ? vc->obedit : vc->obact); - const Object *ob_eval = DEG_get_evaluated_object(vc->depsgraph, object); + const Object *ob_eval = DEG_get_evaluated(vc->depsgraph, object); const GreasePencil &grease_pencil = *static_cast(object->data); const bke::AttrDomain selection_domain = ED_grease_pencil_selection_domain_get( vc->scene->toolsettings, object); diff --git a/source/blender/editors/space_view3d/view3d_snap.cc b/source/blender/editors/space_view3d/view3d_snap.cc index da0de985454..1e8c401c7db 100644 --- a/source/blender/editors/space_view3d/view3d_snap.cc +++ b/source/blender/editors/space_view3d/view3d_snap.cc @@ -584,7 +584,7 @@ static bool snap_selected_to_location_rotation(bContext *C, /* Use the evaluated object here because sometimes * `ob->parent->runtime->curve_cache` is required. */ BKE_scene_graph_evaluated_ensure(depsgraph, bmain); - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob); BKE_object_get_parent_matrix(ob_eval, ob_eval->parent, parentmat); mul_m3_m4m4(originmat, parentmat, ob->parentinv); @@ -921,7 +921,7 @@ static bool snap_curs_to_sel_ex(bContext *C, const int pivot_point, float r_curs count += tvs.transverts_tot; if (tvs.transverts_tot != 0) { - Object *obedit_eval = DEG_get_evaluated_object(depsgraph, obedit); + Object *obedit_eval = DEG_get_evaluated(depsgraph, obedit); copy_m3_m4(bmat, obedit_eval->object_to_world().ptr()); tv = tvs.transverts; @@ -940,7 +940,7 @@ static bool snap_curs_to_sel_ex(bContext *C, const int pivot_point, float r_curs Object *obact = CTX_data_active_object(C); if (obact && (obact->mode & OB_MODE_POSE)) { - Object *obact_eval = DEG_get_evaluated_object(depsgraph, obact); + Object *obact_eval = DEG_get_evaluated(depsgraph, obact); bArmature *arm = static_cast(obact_eval->data); LISTBASE_FOREACH (bPoseChannel *, pchan, &obact_eval->pose->chanbase) { if (ANIM_bonecoll_is_visible_pchan(arm, pchan)) { diff --git a/source/blender/editors/space_view3d/view3d_utils.cc b/source/blender/editors/space_view3d/view3d_utils.cc index 86a981dba50..7b172681804 100644 --- a/source/blender/editors/space_view3d/view3d_utils.cc +++ b/source/blender/editors/space_view3d/view3d_utils.cc @@ -513,7 +513,7 @@ void ED_view3d_persp_switch_from_camera(const Depsgraph *depsgraph, BLI_assert(persp != RV3D_CAMOB); if (v3d->camera) { - Object *ob_camera_eval = DEG_get_evaluated_object(depsgraph, v3d->camera); + Object *ob_camera_eval = DEG_get_evaluated(depsgraph, v3d->camera); rv3d->dist = ED_view3d_offset_distance( ob_camera_eval->object_to_world().ptr(), rv3d->ofs, VIEW3D_DIST_FALLBACK); ED_view3d_from_object(ob_camera_eval, rv3d->ofs, rv3d->viewquat, &rv3d->dist, nullptr); @@ -604,7 +604,7 @@ void ED_view3d_camera_lock_init_ex(const Depsgraph *depsgraph, const bool calc_dist) { if (ED_view3d_camera_lock_check(v3d, rv3d)) { - Object *ob_camera_eval = DEG_get_evaluated_object(depsgraph, v3d->camera); + Object *ob_camera_eval = DEG_get_evaluated(depsgraph, v3d->camera); if (calc_dist) { /* using a fallback dist is OK here since ED_view3d_from_object() compensates for it */ rv3d->dist = ED_view3d_offset_distance( @@ -638,8 +638,8 @@ bool ED_view3d_camera_lock_sync(const Depsgraph *depsgraph, View3D *v3d, RegionV while (root_parent->parent) { root_parent = root_parent->parent; } - Object *ob_camera_eval = DEG_get_evaluated_object(depsgraph, v3d->camera); - Object *root_parent_eval = DEG_get_evaluated_object(depsgraph, root_parent); + Object *ob_camera_eval = DEG_get_evaluated(depsgraph, v3d->camera); + Object *root_parent_eval = DEG_get_evaluated(depsgraph, root_parent); ED_view3d_to_m4(view_mat, rv3d->ofs, rv3d->viewquat, rv3d->dist); @@ -1304,7 +1304,7 @@ float ED_view3d_radius_to_dist(const View3D *v3d, BKE_camera_params_init(¶ms); params.clip_start = v3d->clip_start; params.clip_end = v3d->clip_end; - Object *camera_eval = DEG_get_evaluated_object(depsgraph, v3d->camera); + Object *camera_eval = DEG_get_evaluated(depsgraph, v3d->camera); BKE_camera_params_from_object(¶ms, camera_eval); lens = params.lens; @@ -1655,7 +1655,7 @@ void ED_view3d_to_object(const Depsgraph *depsgraph, float mat[4][4]; ED_view3d_to_m4(mat, ofs, quat, dist); - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob); BKE_object_apply_mat4_ex(ob, mat, ob_eval->parent, ob_eval->parentinv, true); } @@ -1666,7 +1666,7 @@ static bool view3d_camera_to_view_selected_impl(Main *bmain, float *r_clip_start, float *r_clip_end) { - Object *camera_ob_eval = DEG_get_evaluated_object(depsgraph, camera_ob); + Object *camera_ob_eval = DEG_get_evaluated(depsgraph, camera_ob); float co[3]; /* the new location to apply */ float scale; /* only for ortho cameras */ @@ -1727,7 +1727,7 @@ bool ED_view3d_camera_to_view_selected_with_set_clipping(Main *bmain, ((Camera *)camera_ob->data)->clip_end = clip_end; /* TODO: Support update via #ID_RECALC_PARAMETERS. */ - Object *camera_ob_eval = DEG_get_evaluated_object(depsgraph, camera_ob); + Object *camera_ob_eval = DEG_get_evaluated(depsgraph, camera_ob); ((Camera *)camera_ob_eval->data)->clip_start = clip_start; ((Camera *)camera_ob_eval->data)->clip_end = clip_end; diff --git a/source/blender/editors/space_view3d/view3d_view.cc b/source/blender/editors/space_view3d/view3d_view.cc index 7000ad7fc72..47321436ceb 100644 --- a/source/blender/editors/space_view3d/view3d_view.cc +++ b/source/blender/editors/space_view3d/view3d_view.cc @@ -395,7 +395,7 @@ void view3d_viewmatrix_set(const Depsgraph *depsgraph, { if (rv3d->persp == RV3D_CAMOB) { /* obs/camera */ if (v3d->camera) { - Object *ob_camera_eval = DEG_get_evaluated_object(depsgraph, v3d->camera); + Object *ob_camera_eval = DEG_get_evaluated(depsgraph, v3d->camera); obmat_to_viewmat(rv3d, ob_camera_eval); } else { @@ -416,7 +416,7 @@ void view3d_viewmatrix_set(const Depsgraph *depsgraph, rv3d->viewmat[3][2] -= rv3d->dist; } if (v3d->ob_center) { - Object *ob_eval = DEG_get_evaluated_object(depsgraph, v3d->ob_center); + Object *ob_eval = DEG_get_evaluated(depsgraph, v3d->ob_center); float vec[3]; copy_v3_v3(vec, ob_eval->object_to_world().location()); @@ -842,7 +842,7 @@ static bool view3d_localview_init(const Depsgraph *depsgraph, base->local_view_bits &= ~local_view_bit; } FOREACH_BASE_IN_EDIT_MODE_BEGIN (scene, view_layer, v3d, base_iter) { - Object *ob_eval = DEG_get_evaluated_object(depsgraph, base_iter->object); + Object *ob_eval = DEG_get_evaluated(depsgraph, base_iter->object); BKE_object_minmax(ob_eval ? ob_eval : base_iter->object, min, max); base_iter->local_view_bits |= local_view_bit; changed = true; @@ -853,7 +853,7 @@ static bool view3d_localview_init(const Depsgraph *depsgraph, BKE_view_layer_synced_ensure(scene, view_layer); LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer)) { if (BASE_SELECTED(v3d, base)) { - Object *ob_eval = DEG_get_evaluated_object(depsgraph, base->object); + Object *ob_eval = DEG_get_evaluated(depsgraph, base->object); BKE_object_minmax(ob_eval ? ob_eval : base->object, min, max); base->local_view_bits |= local_view_bit; changed = true; diff --git a/source/blender/editors/transform/transform_convert_grease_pencil.cc b/source/blender/editors/transform/transform_convert_grease_pencil.cc index 3d294cf7fb1..c6d74938789 100644 --- a/source/blender/editors/transform/transform_convert_grease_pencil.cc +++ b/source/blender/editors/transform/transform_convert_grease_pencil.cc @@ -181,7 +181,7 @@ static void createTransGreasePencilVerts(bContext *C, TransInfo *t) if (tc.data_len == 0) { continue; } - Object *object_eval = DEG_get_evaluated_object(depsgraph, tc.obedit); + Object *object_eval = DEG_get_evaluated(depsgraph, tc.obedit); GreasePencil &grease_pencil = *static_cast(tc.obedit->data); Span layers = grease_pencil.layers(); diff --git a/source/blender/editors/transform/transform_convert_object.cc b/source/blender/editors/transform/transform_convert_object.cc index d54bbbbb956..4eaa64730ca 100644 --- a/source/blender/editors/transform/transform_convert_object.cc +++ b/source/blender/editors/transform/transform_convert_object.cc @@ -201,7 +201,7 @@ static void ObjectToTransData(TransInfo *t, TransData *td, Object *ob) * evaluate that, and access matrix of that evaluated copy of the object. * Might be more tricky than it sounds, if some logic later on accesses the * object matrix via td->ob->object_to_world().ptr(). */ - Object *object_eval = DEG_get_evaluated_object(t->depsgraph, ob); + Object *object_eval = DEG_get_evaluated(t->depsgraph, ob); if (skip_invert == false && constinv == false) { object_eval->transflag |= OB_NO_CONSTRAINTS; /* #BKE_object_where_is_calc checks this. */ /* It is possible to have transform data initialization prior to a diff --git a/source/blender/editors/transform/transform_mode_edge_slide.cc b/source/blender/editors/transform/transform_mode_edge_slide.cc index c5ea3dcd4f5..6b88ff9da6c 100644 --- a/source/blender/editors/transform/transform_mode_edge_slide.cc +++ b/source/blender/editors/transform/transform_mode_edge_slide.cc @@ -254,7 +254,7 @@ static void calcEdgeSlide_mval_range(TransInfo *t, Array bmbvh_coord_storage; if (use_occlude_geometry) { Scene *scene_eval = DEG_get_evaluated(t->depsgraph, t->scene); - Object *obedit_eval = DEG_get_evaluated_object(t->depsgraph, tc->obedit); + Object *obedit_eval = DEG_get_evaluated(t->depsgraph, tc->obedit); BMEditMesh *em = BKE_editmesh_from_object(tc->obedit); const Span vert_positions = BKE_editmesh_vert_coords_when_deformed( diff --git a/source/blender/editors/transform/transform_snap_object.cc b/source/blender/editors/transform/transform_snap_object.cc index 6a31763c411..84896709cc6 100644 --- a/source/blender/editors/transform/transform_snap_object.cc +++ b/source/blender/editors/transform/transform_snap_object.cc @@ -478,13 +478,13 @@ static eSnapMode iter_snap_objects(SnapObjectContext *sctx, IterSnapObjsCallback } const bool is_object_active = (base == base_act); - Object *obj_eval = DEG_get_evaluated_object(sctx->runtime.depsgraph, base->object); + Object *obj_eval = DEG_get_evaluated(sctx->runtime.depsgraph, base->object); if (obj_eval->transflag & OB_DUPLI || blender::bke::object_has_geometry_set_instances(*obj_eval)) { ListBase *lb = object_duplilist(sctx->runtime.depsgraph, sctx->scene, obj_eval); LISTBASE_FOREACH (DupliObject *, dupli_ob, lb) { - BLI_assert(DEG_is_evaluated_object(dupli_ob->ob)); + BLI_assert(DEG_is_evaluated(dupli_ob->ob)); if ((tmp = sob_callback(sctx, dupli_ob->ob, dupli_ob->ob_data, diff --git a/source/blender/editors/util/ed_viewer_path.cc b/source/blender/editors/util/ed_viewer_path.cc index 2690689d1b1..a8b67a6062a 100644 --- a/source/blender/editors/util/ed_viewer_path.cc +++ b/source/blender/editors/util/ed_viewer_path.cc @@ -79,7 +79,7 @@ ViewerPathElem *viewer_path_elem_for_compute_context(const ComputeContext &compu context->closure_source_location()) { elem->source_output_node_id = source->closure_output_node_id; - BLI_assert(DEG_is_original_id(&source->tree->id)); + BLI_assert(DEG_is_original(source->tree)); elem->source_node_tree = const_cast(source->tree); } return &elem->base; diff --git a/source/blender/editors/uvedit/uvedit_ops.cc b/source/blender/editors/uvedit/uvedit_ops.cc index 79bb4ef8767..5badf9c6795 100644 --- a/source/blender/editors/uvedit/uvedit_ops.cc +++ b/source/blender/editors/uvedit/uvedit_ops.cc @@ -120,8 +120,8 @@ bool ED_object_get_active_image(Object *ob, const bNode **r_node, const bNodeTree **r_ntree) { - Material *ma = DEG_is_evaluated_object(ob) ? BKE_object_material_get_eval(ob, mat_nr) : - BKE_object_material_get(ob, mat_nr); + Material *ma = DEG_is_evaluated(ob) ? BKE_object_material_get_eval(ob, mat_nr) : + BKE_object_material_get(ob, mat_nr); bNodeTree *ntree = (ma && ma->use_nodes) ? ma->nodetree : nullptr; bNode *node = (ntree) ? bke::node_get_active_texture(*ntree) : nullptr; diff --git a/source/blender/editors/uvedit/uvedit_path.cc b/source/blender/editors/uvedit/uvedit_path.cc index 0118b2686f4..b3fe69b6283 100644 --- a/source/blender/editors/uvedit/uvedit_path.cc +++ b/source/blender/editors/uvedit/uvedit_path.cc @@ -530,7 +530,7 @@ static bool uv_shortest_path_pick_ex(Scene *scene, DEG_id_tag_update(static_cast(obedit->data), ID_RECALC_SELECT); } else { - Object *obedit_eval = DEG_get_evaluated_object(depsgraph, obedit); + Object *obedit_eval = DEG_get_evaluated(depsgraph, obedit); BKE_mesh_batch_cache_dirty_tag(static_cast(obedit_eval->data), BKE_MESH_BATCH_DIRTY_UVEDIT_SELECT); } diff --git a/source/blender/editors/uvedit/uvedit_select.cc b/source/blender/editors/uvedit/uvedit_select.cc index 260a23cf547..d1118628f1e 100644 --- a/source/blender/editors/uvedit/uvedit_select.cc +++ b/source/blender/editors/uvedit/uvedit_select.cc @@ -3318,7 +3318,7 @@ static void uv_select_tag_update_for_object(Depsgraph *depsgraph, WM_main_add_notifier(NC_GEOM | ND_SELECT, obedit->data); } else { - Object *obedit_eval = DEG_get_evaluated_object(depsgraph, obedit); + Object *obedit_eval = DEG_get_evaluated(depsgraph, obedit); BKE_mesh_batch_cache_dirty_tag(static_cast(obedit_eval->data), BKE_MESH_BATCH_DIRTY_UVEDIT_SELECT); /* Only for region redraw. */ diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp index 1c7ec371f5b..be9cb123d60 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp @@ -436,7 +436,7 @@ void BlenderFileLoader::insertShapeNode(Object *ob, Mesh *mesh, int id) CD_FREESTYLE_FACE); // Compute view matrix - Object *ob_camera_eval = DEG_get_evaluated_object(_depsgraph, RE_GetCamera(_re)); + Object *ob_camera_eval = DEG_get_evaluated(_depsgraph, RE_GetCamera(_re)); float viewinv[4][4], viewmat[4][4]; RE_GetCameraModelMatrix(_re, ob_camera_eval, viewinv); invert_m4_m4(viewmat, viewinv); diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index b2965ca5b95..1832548d9f7 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -612,7 +612,7 @@ void FRS_do_stroke_rendering(Render *re, ViewLayer *view_layer) * Objects are transformed into camera coordinate system, therefore the camera position * is zero and the modelview matrix is the identity matrix. */ Object *ob_camera_orig = RE_GetCamera(re); - Object *ob_camera_eval = DEG_get_evaluated_object(depsgraph, ob_camera_orig); + Object *ob_camera_eval = DEG_get_evaluated(depsgraph, ob_camera_orig); zero_v3(g_freestyle.viewpoint); unit_m4(g_freestyle.mv); RE_GetCameraWindow(re, ob_camera_eval, g_freestyle.proj); diff --git a/source/blender/io/collada/BlenderContext.cpp b/source/blender/io/collada/BlenderContext.cpp index 0573db578a3..2f1e2d349f3 100644 --- a/source/blender/io/collada/BlenderContext.cpp +++ b/source/blender/io/collada/BlenderContext.cpp @@ -133,7 +133,7 @@ Scene *BlenderContext::get_evaluated_scene() Object *BlenderContext::get_evaluated_object(Object *ob) { - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob); return ob_eval; } diff --git a/source/blender/io/collada/collada_utils.cpp b/source/blender/io/collada/collada_utils.cpp index 3b123f45c4e..089eadd5139 100644 --- a/source/blender/io/collada/collada_utils.cpp +++ b/source/blender/io/collada/collada_utils.cpp @@ -271,7 +271,7 @@ Mesh *bc_get_mesh_copy(BlenderContext &blender_context, } #else Depsgraph *depsgraph = blender_context.get_depsgraph(); - const Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + const Object *ob_eval = DEG_get_evaluated(depsgraph, ob); tmpmesh = BKE_object_get_evaluated_mesh(ob_eval); #endif } diff --git a/source/blender/io/common/intern/abstract_hierarchy_iterator.cc b/source/blender/io/common/intern/abstract_hierarchy_iterator.cc index ea41963ae65..f4ba97741fb 100644 --- a/source/blender/io/common/intern/abstract_hierarchy_iterator.cc +++ b/source/blender/io/common/intern/abstract_hierarchy_iterator.cc @@ -645,7 +645,7 @@ void AbstractHierarchyIterator::make_writers(const HierarchyContext *parent_cont return; } - BLI_assert(DEG_is_evaluated_object(context->object)); + BLI_assert(DEG_is_evaluated(context->object)); if (transform_writer.is_newly_created() || export_subset_.transforms) { /* XXX This can lead to too many XForms being written. For example, a camera writer can * refuse to write an orthographic camera. By the time that this is known, the XForm has diff --git a/source/blender/io/grease_pencil/intern/grease_pencil_io.cc b/source/blender/io/grease_pencil/intern/grease_pencil_io.cc index 2384adc29a2..e3eb6fc0634 100644 --- a/source/blender/io/grease_pencil/intern/grease_pencil_io.cc +++ b/source/blender/io/grease_pencil/intern/grease_pencil_io.cc @@ -242,7 +242,7 @@ static std::optional> compute_objects_bounds( std::optional> full_bounds = std::nullopt; for (const ObjectInfo &info : objects) { - const Object *object_eval = DEG_get_evaluated_object(&depsgraph, info.object); + const Object *object_eval = DEG_get_evaluated(&depsgraph, info.object); const GreasePencil &grease_pencil_eval = *static_cast(object_eval->data); for (const int layer_index : grease_pencil_eval.layers().index_range()) { diff --git a/source/blender/io/grease_pencil/intern/grease_pencil_io_export_pdf.cc b/source/blender/io/grease_pencil/intern/grease_pencil_io_export_pdf.cc index 3a9e5acc2df..64df7bd3378 100644 --- a/source/blender/io/grease_pencil/intern/grease_pencil_io_export_pdf.cc +++ b/source/blender/io/grease_pencil/intern/grease_pencil_io_export_pdf.cc @@ -66,7 +66,7 @@ static bool is_selected_frame(const GreasePencil &grease_pencil, const int frame bool PDFExporter::export_scene(Scene &scene, StringRefNull filepath) { bool result = false; - Object &ob_eval = *DEG_get_evaluated_object(context_.depsgraph, params_.object); + Object &ob_eval = *DEG_get_evaluated(context_.depsgraph, params_.object); if (!create_document()) { return false; @@ -125,7 +125,7 @@ void PDFExporter::export_grease_pencil_objects(const int frame_number) const Object *ob = info.object; /* Use evaluated version to get strokes with modifiers. */ - const Object *ob_eval = DEG_get_evaluated_object(context_.depsgraph, ob); + const Object *ob_eval = DEG_get_evaluated(context_.depsgraph, ob); BLI_assert(ob_eval->type == OB_GREASE_PENCIL); const GreasePencil *grease_pencil_eval = static_cast(ob_eval->data); diff --git a/source/blender/io/grease_pencil/intern/grease_pencil_io_export_svg.cc b/source/blender/io/grease_pencil/intern/grease_pencil_io_export_svg.cc index 6db42a4574e..79dc5136793 100644 --- a/source/blender/io/grease_pencil/intern/grease_pencil_io_export_svg.cc +++ b/source/blender/io/grease_pencil/intern/grease_pencil_io_export_svg.cc @@ -175,7 +175,7 @@ void SVGExporter::export_grease_pencil_objects(pugi::xml_node node, const int fr ob_node.append_attribute("id").set_value(obtxt); /* Use evaluated version to get strokes with modifiers. */ - const Object *ob_eval = DEG_get_evaluated_object(context_.depsgraph, ob); + const Object *ob_eval = DEG_get_evaluated(context_.depsgraph, ob); BLI_assert(ob_eval->type == OB_GREASE_PENCIL); const GreasePencil *grease_pencil_eval = static_cast(ob_eval->data); diff --git a/source/blender/io/ply/exporter/ply_export_load_plydata.cc b/source/blender/io/ply/exporter/ply_export_load_plydata.cc index 1df7f8bccfc..4c0e3d9a7a1 100644 --- a/source/blender/io/ply/exporter/ply_export_load_plydata.cc +++ b/source/blender/io/ply/exporter/ply_export_load_plydata.cc @@ -343,7 +343,7 @@ void load_plydata(PlyData &plyData, Depsgraph *depsgraph, const PLYExportParams continue; } - Object *obj_eval = DEG_get_evaluated_object(depsgraph, object); + Object *obj_eval = DEG_get_evaluated(depsgraph, object); const Mesh *mesh = export_params.apply_modifiers ? BKE_object_get_evaluated_mesh(obj_eval) : BKE_object_get_pre_modified_mesh(obj_eval); diff --git a/source/blender/io/stl/exporter/stl_export.cc b/source/blender/io/stl/exporter/stl_export.cc index fd57054828a..1682fd2043c 100644 --- a/source/blender/io/stl/exporter/stl_export.cc +++ b/source/blender/io/stl/exporter/stl_export.cc @@ -112,7 +112,7 @@ void export_frame(Depsgraph *depsgraph, } } - Object *obj_eval = DEG_get_evaluated_object(depsgraph, object); + Object *obj_eval = DEG_get_evaluated(depsgraph, object); const Mesh *mesh = export_params.apply_modifiers ? BKE_object_get_evaluated_mesh(obj_eval) : BKE_object_get_pre_modified_mesh(obj_eval); diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc index 4310d85f3fc..6ce8e797876 100644 --- a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc +++ b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc @@ -38,7 +38,7 @@ namespace blender::io::obj { OBJMesh::OBJMesh(Depsgraph *depsgraph, const OBJExportParams &export_params, Object *mesh_object) { /* We need to copy the object because it may be in temporary space. */ - Object *obj_eval = DEG_get_evaluated_object(depsgraph, mesh_object); + Object *obj_eval = DEG_get_evaluated(depsgraph, mesh_object); object_name_ = obj_eval->id.name + 2; export_mesh_ = nullptr; diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.cc b/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.cc index 0c93a3874c7..1ee8ae02fc8 100644 --- a/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.cc +++ b/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.cc @@ -24,7 +24,7 @@ OBJCurve::OBJCurve(const Depsgraph *depsgraph, Object *curve_object) : export_object_eval_(curve_object) { - export_object_eval_ = DEG_get_evaluated_object(depsgraph, curve_object); + export_object_eval_ = DEG_get_evaluated(depsgraph, curve_object); export_curve_ = static_cast(export_object_eval_->data); set_world_axes_transform(export_params.forward_axis, export_params.up_axis); } diff --git a/source/blender/makesrna/intern/rna_collection.cc b/source/blender/makesrna/intern/rna_collection.cc index 085e03a62c5..4e3a01b1f6d 100644 --- a/source/blender/makesrna/intern/rna_collection.cc +++ b/source/blender/makesrna/intern/rna_collection.cc @@ -98,12 +98,12 @@ static bool rna_collection_objects_edit_check(Collection *collection, ReportList *reports, Object *object) { - if (!DEG_is_original_id(&collection->id)) { + if (!DEG_is_original(collection)) { BKE_reportf( reports, RPT_ERROR, "Collection '%s' is not an original ID", collection->id.name + 2); return false; } - if (!DEG_is_original_id(&object->id)) { + if (!DEG_is_original(object)) { BKE_reportf(reports, RPT_ERROR, "Collection '%s' is not an original ID", object->id.name + 2); return false; } @@ -226,12 +226,12 @@ static bool rna_collection_children_edit_check(Collection *collection, ReportList *reports, Collection *child) { - if (!DEG_is_original_id(&collection->id)) { + if (!DEG_is_original(collection)) { BKE_reportf( reports, RPT_ERROR, "Collection '%s' is not an original ID", collection->id.name + 2); return false; } - if (!DEG_is_original_id(&child->id)) { + if (!DEG_is_original(child)) { BKE_reportf(reports, RPT_ERROR, "Collection '%s' is not an original ID", child->id.name + 2); return false; } diff --git a/source/blender/makesrna/intern/rna_modifier.cc b/source/blender/makesrna/intern/rna_modifier.cc index 545aa61f339..12515336a72 100644 --- a/source/blender/makesrna/intern/rna_modifier.cc +++ b/source/blender/makesrna/intern/rna_modifier.cc @@ -1603,7 +1603,7 @@ static const EnumPropertyItem *rna_DataTransferModifier_layers_select_src_itemf( int num_data, i; Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); - const Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob_src); + const Object *ob_eval = DEG_get_evaluated(depsgraph, ob_src); if (!ob_eval) { RNA_enum_item_end(&item, &totitem); *r_free = true; @@ -1640,7 +1640,7 @@ static const EnumPropertyItem *rna_DataTransferModifier_layers_select_src_itemf( bke::AttrDomain::Corner; Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); - const Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob_src); + const Object *ob_eval = DEG_get_evaluated(depsgraph, ob_src); if (!ob_eval) { RNA_enum_item_end(&item, &totitem); *r_free = true; diff --git a/source/blender/makesrna/intern/rna_nodetree.cc b/source/blender/makesrna/intern/rna_nodetree.cc index c7a269315d9..e19e582330d 100644 --- a/source/blender/makesrna/intern/rna_nodetree.cc +++ b/source/blender/makesrna/intern/rna_nodetree.cc @@ -1593,7 +1593,7 @@ static void rna_NodeTree_debug_lazy_function_graph(bNodeTree *tree, { *r_len = 0; *r_str = nullptr; - if (DEG_is_original_id(&tree->id)) { + if (DEG_is_original(tree)) { /* The graph is only stored on the evaluated data. */ Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); tree = DEG_get_evaluated(depsgraph, tree); @@ -1613,7 +1613,7 @@ static void rna_NodeTree_debug_zone_body_lazy_function_graph( *r_len = 0; *r_str = nullptr; bNodeTree *tree = reinterpret_cast(tree_id); - if (DEG_is_original_id(&tree->id)) { + if (DEG_is_original(tree)) { /* The graph is only stored on the evaluated data. */ Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); tree = DEG_get_evaluated(depsgraph, tree); diff --git a/source/blender/makesrna/intern/rna_object.cc b/source/blender/makesrna/intern/rna_object.cc index 1eb7e4c984b..aa3754ffe29 100644 --- a/source/blender/makesrna/intern/rna_object.cc +++ b/source/blender/makesrna/intern/rna_object.cc @@ -1330,7 +1330,7 @@ static PointerRNA rna_MaterialSlot_material_get(PointerRNA *ptr) Material *ma; const int index = rna_MaterialSlot_index(ptr); - if (DEG_is_evaluated_object(ob)) { + if (DEG_is_evaluated(ob)) { ma = BKE_object_material_get_eval(ob, index + 1); } else { @@ -1443,7 +1443,7 @@ static std::optional rna_MaterialSlot_path(const PointerRNA *ptr) static int rna_Object_material_slots_length(PointerRNA *ptr) { Object *ob = reinterpret_cast(ptr->owner_id); - if (DEG_is_evaluated_object(ob)) { + if (DEG_is_evaluated(ob)) { return BKE_object_material_count_eval(ob); } else { diff --git a/source/blender/makesrna/intern/rna_object_api.cc b/source/blender/makesrna/intern/rna_object_api.cc index 8c95d13d270..da015ad1a0e 100644 --- a/source/blender/makesrna/intern/rna_object_api.cc +++ b/source/blender/makesrna/intern/rna_object_api.cc @@ -342,7 +342,7 @@ static void rna_Object_calc_matrix_camera(Object *ob, float scalex, float scaley) { - const Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + const Object *ob_eval = DEG_get_evaluated(depsgraph, ob); CameraParams params; /* setup parameters */ @@ -569,7 +569,7 @@ static Object *eval_object_ensure(Object *ob, depsgraph = CTX_data_ensure_evaluated_depsgraph(C); } if (depsgraph != nullptr) { - ob = DEG_get_evaluated_object(depsgraph, ob); + ob = DEG_get_evaluated(depsgraph, ob); } if (ob == nullptr || BKE_object_get_evaluated_mesh(ob) == nullptr) { BKE_reportf( diff --git a/source/blender/makesrna/intern/rna_render.cc b/source/blender/makesrna/intern/rna_render.cc index 53890b42895..c53988139d9 100644 --- a/source/blender/makesrna/intern/rna_render.cc +++ b/source/blender/makesrna/intern/rna_render.cc @@ -446,7 +446,7 @@ static PointerRNA rna_RenderEngine_camera_override_get(PointerRNA *ptr) /* TODO(sergey): Shouldn't engine point to an evaluated datablocks already? */ if (engine->re) { Object *cam = RE_GetCamera(engine->re); - Object *cam_eval = DEG_get_evaluated_object(engine->depsgraph, cam); + Object *cam_eval = DEG_get_evaluated(engine->depsgraph, cam); return RNA_id_pointer_create(reinterpret_cast(cam_eval)); } else { diff --git a/source/blender/makesrna/intern/rna_scene.cc b/source/blender/makesrna/intern/rna_scene.cc index c1b868be031..ab0fae0271a 100644 --- a/source/blender/makesrna/intern/rna_scene.cc +++ b/source/blender/makesrna/intern/rna_scene.cc @@ -2073,7 +2073,7 @@ static void object_simplify_update(Scene *scene, for (md = static_cast(ob->modifiers.first); md; md = md->next) { if (md->type == eModifierType_Nodes && depsgraph != nullptr) { - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob); const blender::bke::GeometrySet *geometry_set = ob_eval->runtime->geometry_set_eval; if (geometry_set != nullptr && geometry_set->has_volume()) { DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_shrinkwrap.cc b/source/blender/modifiers/intern/MOD_grease_pencil_shrinkwrap.cc index 3741e923633..9a87832bb46 100644 --- a/source/blender/modifiers/intern/MOD_grease_pencil_shrinkwrap.cc +++ b/source/blender/modifiers/intern/MOD_grease_pencil_shrinkwrap.cc @@ -193,7 +193,7 @@ static void ensure_shrinkwrap_cache_data(GreasePencilShrinkwrapModifierData &smd MEM_delete(smd.cache_data); smd.cache_data = nullptr; } - Object *target_ob = DEG_get_evaluated_object(ctx.depsgraph, smd.target); + Object *target_ob = DEG_get_evaluated(ctx.depsgraph, smd.target); Mesh *target_mesh = BKE_modifier_get_evaluated_mesh_from_evaluated_object(target_ob); smd.cache_data = MEM_new(__func__); diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc index d48e4cb11d4..59f0278ee00 100644 --- a/source/blender/modifiers/intern/MOD_nodes.cc +++ b/source/blender/modifiers/intern/MOD_nodes.cc @@ -650,7 +650,7 @@ static void try_add_side_effect_node(const ModifierEvalContext &ctx, } /* The tree may sometimes be original and sometimes evaluated, depending on the source of the * compute context. */ - const bNodeTree *eval_closure_tree = DEG_is_evaluated_id(&source_location->tree->id) ? + const bNodeTree *eval_closure_tree = DEG_is_evaluated(source_location->tree) ? source_location->tree : reinterpret_cast( DEG_get_evaluated_id( diff --git a/source/blender/modifiers/intern/MOD_subsurf.cc b/source/blender/modifiers/intern/MOD_subsurf.cc index 27925c82858..d4aaf34e4c8 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.cc +++ b/source/blender/modifiers/intern/MOD_subsurf.cc @@ -411,7 +411,7 @@ static void panel_draw(const bContext *C, Panel *panel) RPT_("Sharp edges or custom normals detected, disabling GPU subdivision"), ICON_INFO); } - else if (Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob)) { + else if (Object *ob_eval = DEG_get_evaluated(depsgraph, ob)) { if (ModifierData *md_eval = BKE_modifiers_findby_name(ob_eval, smd->modifier.name)) { if (md_eval->type == eModifierType_Subsurf) { SubsurfRuntimeData *runtime_data = (SubsurfRuntimeData *)md_eval->runtime; diff --git a/source/blender/modifiers/intern/lineart/lineart_cpu.cc b/source/blender/modifiers/intern/lineart/lineart_cpu.cc index e34476e173a..2771598d3b6 100644 --- a/source/blender/modifiers/intern/lineart/lineart_cpu.cc +++ b/source/blender/modifiers/intern/lineart/lineart_cpu.cc @@ -2533,7 +2533,7 @@ static void lineart_object_load_single_instance(LineartData *ld, obi->original_me = use_mesh; obi->original_ob = (ref_ob->id.orig_id ? (Object *)ref_ob->id.orig_id : ref_ob); - obi->original_ob_eval = DEG_get_evaluated_object(depsgraph, obi->original_ob); + obi->original_ob_eval = DEG_get_evaluated(depsgraph, obi->original_ob); lineart_geometry_load_assign_thread(olti, obi, thread_count, use_mesh->faces_num); } @@ -2618,7 +2618,7 @@ void lineart_main_load_geometries(Depsgraph *depsgraph, obindex++; - Object *eval_ob = DEG_get_evaluated_object(depsgraph, ob); + Object *eval_ob = DEG_get_evaluated(depsgraph, ob); if (!eval_ob) { continue; @@ -5018,8 +5018,7 @@ bool MOD_lineart_compute_feature_lines_v3(Depsgraph *depsgraph, bool use_render_camera_override = false; if (lmd.calculation_flags & MOD_LINEART_USE_CUSTOM_CAMERA) { if (!lmd.source_camera || - (lineart_camera = DEG_get_evaluated_object(depsgraph, lmd.source_camera))->type != - OB_CAMERA) + (lineart_camera = DEG_get_evaluated(depsgraph, lmd.source_camera))->type != OB_CAMERA) { return false; } @@ -5027,7 +5026,7 @@ bool MOD_lineart_compute_feature_lines_v3(Depsgraph *depsgraph, else { Render *render = RE_GetSceneRender(scene); if (render && render->camera_override) { - lineart_camera = DEG_get_evaluated_object(depsgraph, render->camera_override); + lineart_camera = DEG_get_evaluated(depsgraph, render->camera_override); use_render_camera_override = true; } if (!lineart_camera) { @@ -5425,7 +5424,7 @@ void MOD_lineart_gpencil_generate_v3(const LineartCache *cache, int src_deform_group = -1; Mesh *src_mesh = nullptr; if (source_vgname && vgroup_weights) { - Object *eval_ob = DEG_get_evaluated_object(depsgraph, cwi.chain->object_ref); + Object *eval_ob = DEG_get_evaluated(depsgraph, cwi.chain->object_ref); if (eval_ob && eval_ob->type == OB_MESH) { src_mesh = BKE_object_get_evaluated_mesh(eval_ob); src_dvert = src_mesh->deform_verts_for_write().data(); diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_active_camera.cc b/source/blender/nodes/geometry/nodes/node_geo_input_active_camera.cc index 7f75e6a19f8..b2cb3f4384a 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_active_camera.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_active_camera.cc @@ -17,7 +17,7 @@ static void node_declare(NodeDeclarationBuilder &b) static void node_exec(GeoNodeExecParams params) { const Scene *scene = DEG_get_evaluated_scene(params.depsgraph()); - Object *camera = DEG_get_evaluated_object(params.depsgraph(), scene->camera); + Object *camera = DEG_get_evaluated(params.depsgraph(), scene->camera); params.set_output("Active Camera", camera); } diff --git a/source/blender/nodes/intern/geometry_nodes_lazy_function.cc b/source/blender/nodes/intern/geometry_nodes_lazy_function.cc index e41a081449f..cc44c3310a4 100644 --- a/source/blender/nodes/intern/geometry_nodes_lazy_function.cc +++ b/source/blender/nodes/intern/geometry_nodes_lazy_function.cc @@ -4274,8 +4274,8 @@ const Object *GeoNodesCallData::self_object() const return this->modifier_data->self_object; } if (this->operator_data) { - return DEG_get_evaluated_object(this->operator_data->depsgraphs->active, - const_cast(this->operator_data->self_object_orig)); + return DEG_get_evaluated(this->operator_data->depsgraphs->active, + const_cast(this->operator_data->self_object_orig)); } return nullptr; } diff --git a/source/blender/nodes/intern/geometry_nodes_log.cc b/source/blender/nodes/intern/geometry_nodes_log.cc index 75565932ba6..26288cd4d50 100644 --- a/source/blender/nodes/intern/geometry_nodes_log.cc +++ b/source/blender/nodes/intern/geometry_nodes_log.cc @@ -732,7 +732,7 @@ static std::optional get_original_session_uid(const ID *id) if (!id) { return {}; } - if (DEG_is_original_id(id)) { + if (DEG_is_original(id)) { return id->session_uid; } if (const ID *id_orig = DEG_get_original(id)) { @@ -794,7 +794,7 @@ GeoTreeLogger &GeoModifierLog::get_local_tree_logger(const ComputeContext &compu const std::optional &location = context->closure_source_location(); if (location.has_value()) { - BLI_assert(DEG_is_evaluated_id(&location->tree->id)); + BLI_assert(DEG_is_evaluated(location->tree)); tree_logger.tree_orig_session_uid = DEG_get_original_id(&location->tree->id)->session_uid; } } diff --git a/source/blender/nodes/shader/nodes/node_shader_normal_map.cc b/source/blender/nodes/shader/nodes/node_shader_normal_map.cc index 4b04b489922..5b932c64135 100644 --- a/source/blender/nodes/shader/nodes/node_shader_normal_map.cc +++ b/source/blender/nodes/shader/nodes/node_shader_normal_map.cc @@ -44,7 +44,7 @@ static void node_shader_buts_normal_map(uiLayout *layout, bContext *C, PointerRN Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C); if (depsgraph) { - Object *object_eval = DEG_get_evaluated_object(depsgraph, object); + Object *object_eval = DEG_get_evaluated(depsgraph, object); PointerRNA dataptr = RNA_id_pointer_create(static_cast(object_eval->data)); uiItemPointerR(layout, ptr, "uv_map", &dataptr, "uv_layers", "", ICON_GROUP_UVS); return; diff --git a/source/blender/nodes/shader/nodes/node_shader_tangent.cc b/source/blender/nodes/shader/nodes/node_shader_tangent.cc index 3bbe12b0a02..f0754a05f38 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tangent.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tangent.cc @@ -33,7 +33,7 @@ static void node_shader_buts_tangent(uiLayout *layout, bContext *C, PointerRNA * Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C); if (depsgraph) { - Object *object_eval = DEG_get_evaluated_object(depsgraph, object); + Object *object_eval = DEG_get_evaluated(depsgraph, object); PointerRNA dataptr = RNA_id_pointer_create(static_cast(object_eval->data)); uiItemPointerR(layout, ptr, "uv_map", &dataptr, "uv_layers", "", ICON_GROUP_UVS); return; diff --git a/source/blender/nodes/shader/nodes/node_shader_uvmap.cc b/source/blender/nodes/shader/nodes/node_shader_uvmap.cc index c2cf918d69b..a7ffccf1b64 100644 --- a/source/blender/nodes/shader/nodes/node_shader_uvmap.cc +++ b/source/blender/nodes/shader/nodes/node_shader_uvmap.cc @@ -35,7 +35,7 @@ static void node_shader_buts_uvmap(uiLayout *layout, bContext *C, PointerRNA *pt Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C); if (depsgraph) { - Object *object_eval = DEG_get_evaluated_object(depsgraph, object); + Object *object_eval = DEG_get_evaluated(depsgraph, object); PointerRNA dataptr = RNA_id_pointer_create(static_cast(object_eval->data)); uiItemPointerR(layout, ptr, "uv_map", &dataptr, "uv_layers", "", ICON_GROUP_UVS); return; diff --git a/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc b/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc index cd2cccf37e8..2b36eb13c5f 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc +++ b/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc @@ -31,7 +31,7 @@ static void node_shader_buts_vertex_color(uiLayout *layout, bContext *C, Pointer Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C); if (depsgraph) { - Object *object_eval = DEG_get_evaluated_object(depsgraph, object); + Object *object_eval = DEG_get_evaluated(depsgraph, object); PointerRNA dataptr = RNA_id_pointer_create(static_cast(object_eval->data)); uiItemPointerR(layout, ptr, "layer_name", &dataptr, "color_attributes", "", ICON_GROUP_VCOL); return; diff --git a/source/blender/python/bmesh/bmesh_py_types.cc b/source/blender/python/bmesh/bmesh_py_types.cc index 3739110d93f..b2cc9335d07 100644 --- a/source/blender/python/bmesh/bmesh_py_types.cc +++ b/source/blender/python/bmesh/bmesh_py_types.cc @@ -1302,7 +1302,7 @@ static PyObject *bpy_bmesh_from_object(BPy_BMesh *self, PyObject *args, PyObject const bool use_render = DEG_get_mode(depsgraph) == DAG_EVAL_RENDER; scene_eval = DEG_get_evaluated_scene(depsgraph); - ob_eval = DEG_get_evaluated_object(depsgraph, ob); + ob_eval = DEG_get_evaluated(depsgraph, ob); bool need_free = false; /* Write the display mesh into the dummy mesh */ diff --git a/source/blender/python/intern/bpy_geometry_set.cc b/source/blender/python/intern/bpy_geometry_set.cc index df73dd6bd34..590b15f2f9e 100644 --- a/source/blender/python/intern/bpy_geometry_set.cc +++ b/source/blender/python/intern/bpy_geometry_set.cc @@ -120,7 +120,7 @@ static BPy_GeometrySet *BPy_GeometrySet_static_from_evaluated_object(PyObject * return nullptr; } Object *evaluated_object = reinterpret_cast(evaluated_object_id); - if (!DEG_is_evaluated_object(evaluated_object)) { + if (!DEG_is_evaluated(evaluated_object)) { PyErr_SetString(PyExc_TypeError, "Expected an evaluated object"); return nullptr; } diff --git a/source/blender/python/mathutils/mathutils_bvhtree.cc b/source/blender/python/mathutils/mathutils_bvhtree.cc index fcde1285631..3d1d477e82d 100644 --- a/source/blender/python/mathutils/mathutils_bvhtree.cc +++ b/source/blender/python/mathutils/mathutils_bvhtree.cc @@ -1029,7 +1029,7 @@ static const Mesh *bvh_get_mesh(const char *funcname, const bool use_cage, bool *r_free_mesh) { - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *ob_eval = DEG_get_evaluated(depsgraph, ob); /* we only need minimum mesh data for topology and vertex locations */ const CustomData_MeshMasks data_masks = CD_MASK_BAREMESH; const bool use_render = DEG_get_mode(depsgraph) == DAG_EVAL_RENDER; diff --git a/source/blender/render/intern/pipeline.cc b/source/blender/render/intern/pipeline.cc index fa88a1749e2..72c7a11e475 100644 --- a/source/blender/render/intern/pipeline.cc +++ b/source/blender/render/intern/pipeline.cc @@ -1437,7 +1437,7 @@ static void renderresult_stampinfo(Render *re) RE_AcquireResultImage(re, &rres, nr); if (rres.ibuf != nullptr) { - Object *ob_camera_eval = DEG_get_evaluated_object(re->pipeline_depsgraph, RE_GetCamera(re)); + Object *ob_camera_eval = DEG_get_evaluated(re->pipeline_depsgraph, RE_GetCamera(re)); BKE_image_stamp_buf(re->scene, ob_camera_eval, (re->scene->r.stamp & R_STAMP_STRIPMETA) ? rres.stamp_data : nullptr, @@ -1655,7 +1655,7 @@ static void do_render_full_pipeline(Render *re) if (re->result != nullptr) { /* sequence rendering should have taken care of that already */ if (!(render_seq && (re->scene->r.stamp & R_STAMP_STRIPMETA))) { - Object *ob_camera_eval = DEG_get_evaluated_object(re->pipeline_depsgraph, RE_GetCamera(re)); + Object *ob_camera_eval = DEG_get_evaluated(re->pipeline_depsgraph, RE_GetCamera(re)); BKE_render_result_stamp_info(re->scene, ob_camera_eval, re->result, false); } diff --git a/source/blender/sequencer/intern/render.cc b/source/blender/sequencer/intern/render.cc index 34585b94711..37fef8ac3e9 100644 --- a/source/blender/sequencer/intern/render.cc +++ b/source/blender/sequencer/intern/render.cc @@ -1471,7 +1471,7 @@ static ImBuf *seq_render_scene_strip(const RenderData *context, /* opengl offscreen render */ depsgraph = BKE_scene_ensure_depsgraph(context->bmain, scene, view_layer); BKE_scene_graph_update_for_newframe(depsgraph); - Object *camera_eval = DEG_get_evaluated_object(depsgraph, camera); + Object *camera_eval = DEG_get_evaluated(depsgraph, camera); ibuf = view3d_fn( /* set for OpenGL render (nullptr when scrubbing) */ depsgraph,