From 7773393d35ac0c43643786754f04d860c3c329fc Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Mon, 14 Feb 2022 12:05:54 -0600 Subject: Cleanup: Pass const Scene to mesh evaluation --- source/blender/blenkernel/BKE_DerivedMesh.h | 10 ++++----- source/blender/blenkernel/BKE_mesh_runtime.h | 10 ++++----- source/blender/blenkernel/BKE_paint.h | 3 ++- source/blender/blenkernel/intern/DerivedMesh.cc | 28 ++++++++++++------------- source/blender/blenkernel/intern/paint.c | 2 +- 5 files changed, 27 insertions(+), 26 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index f1c523c6cd2..fea5f515db8 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -299,22 +299,22 @@ void mesh_get_mapped_verts_coords(struct Mesh *me_eval, float (*r_cos)[3], int t * Same as above but won't use render settings. */ struct Mesh *editbmesh_get_eval_cage(struct Depsgraph *depsgraph, - struct Scene *scene, - struct Object *, + const struct Scene *scene, + struct Object *obedit, struct BMEditMesh *em, const struct CustomData_MeshMasks *dataMask); struct Mesh *editbmesh_get_eval_cage_from_orig(struct Depsgraph *depsgraph, - struct Scene *scene, + const struct Scene *scene, struct Object *obedit, const struct CustomData_MeshMasks *dataMask); float (*editbmesh_vert_coords_alloc(struct BMEditMesh *em, int *r_vert_len))[3]; -bool editbmesh_modifier_is_enabled(struct Scene *scene, +bool editbmesh_modifier_is_enabled(const struct Scene *scene, const struct Object *ob, struct ModifierData *md, bool has_prev_mesh); void makeDerivedMesh(struct Depsgraph *depsgraph, - struct Scene *scene, + const struct Scene *scene, struct Object *ob, const struct CustomData_MeshMasks *dataMask); diff --git a/source/blender/blenkernel/BKE_mesh_runtime.h b/source/blender/blenkernel/BKE_mesh_runtime.h index a007e04f066..0e78f9d7e15 100644 --- a/source/blender/blenkernel/BKE_mesh_runtime.h +++ b/source/blender/blenkernel/BKE_mesh_runtime.h @@ -72,26 +72,26 @@ void BKE_mesh_runtime_verttri_from_looptri(struct MVertTri *r_verttri, * For now keep the names similar to avoid confusion. */ struct Mesh *mesh_get_eval_final(struct Depsgraph *depsgraph, - struct Scene *scene, + const struct Scene *scene, struct Object *ob, const struct CustomData_MeshMasks *dataMask); struct Mesh *mesh_get_eval_deform(struct Depsgraph *depsgraph, - struct Scene *scene, + const struct Scene *scene, struct Object *ob, const struct CustomData_MeshMasks *dataMask); struct Mesh *mesh_create_eval_final(struct Depsgraph *depsgraph, - struct Scene *scene, + const struct Scene *scene, struct Object *ob, const struct CustomData_MeshMasks *dataMask); struct Mesh *mesh_create_eval_no_deform(struct Depsgraph *depsgraph, - struct Scene *scene, + const struct Scene *scene, struct Object *ob, const struct CustomData_MeshMasks *dataMask); struct Mesh *mesh_create_eval_no_deform_render(struct Depsgraph *depsgraph, - struct Scene *scene, + const struct Scene *scene, struct Object *ob, const struct CustomData_MeshMasks *dataMask); diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h index f38152af327..1f37e95a023 100644 --- a/source/blender/blenkernel/BKE_paint.h +++ b/source/blender/blenkernel/BKE_paint.h @@ -661,7 +661,8 @@ void BKE_sculpt_update_object_after_eval(struct Depsgraph *depsgraph, struct Obj * Sculpt mode handles multi-res differently from regular meshes, but only if * it's the last modifier on the stack and it is not on the first level. */ -struct MultiresModifierData *BKE_sculpt_multires_active(struct Scene *scene, struct Object *ob); +struct MultiresModifierData *BKE_sculpt_multires_active(const struct Scene *scene, + struct Object *ob); int BKE_sculpt_mask_layers_ensure(struct Object *ob, struct MultiresModifierData *mmd); void BKE_sculpt_toolsettings_data_ensure(struct Scene *scene); diff --git a/source/blender/blenkernel/intern/DerivedMesh.cc b/source/blender/blenkernel/intern/DerivedMesh.cc index a0c1c53e7ea..542be4027bc 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.cc +++ b/source/blender/blenkernel/intern/DerivedMesh.cc @@ -722,7 +722,7 @@ static Mesh *modifier_modify_mesh_and_geometry_set(ModifierData *md, } static void mesh_calc_modifiers(struct Depsgraph *depsgraph, - Scene *scene, + const Scene *scene, Object *ob, const bool use_deform, const bool need_mapping, @@ -1240,7 +1240,7 @@ float (*editbmesh_vert_coords_alloc(BMEditMesh *em, int *r_vert_len))[3] return cos; } -bool editbmesh_modifier_is_enabled(Scene *scene, +bool editbmesh_modifier_is_enabled(const Scene *scene, const Object *ob, ModifierData *md, bool has_prev_mesh) @@ -1301,7 +1301,7 @@ static void editbmesh_calc_modifier_final_normals(Mesh *mesh_final, } static void editbmesh_calc_modifiers(struct Depsgraph *depsgraph, - Scene *scene, + const Scene *scene, Object *ob, BMEditMesh *em_input, const CustomData_MeshMasks *dataMask, @@ -1595,7 +1595,7 @@ static void mesh_build_extra_data(struct Depsgraph *depsgraph, Object *ob, Mesh } static void mesh_build_data(struct Depsgraph *depsgraph, - Scene *scene, + const Scene *scene, Object *ob, const CustomData_MeshMasks *dataMask, const bool need_mapping) @@ -1661,7 +1661,7 @@ static void mesh_build_data(struct Depsgraph *depsgraph, } static void editbmesh_build_data(struct Depsgraph *depsgraph, - Scene *scene, + const Scene *scene, Object *obedit, BMEditMesh *em, CustomData_MeshMasks *dataMask) @@ -1754,7 +1754,7 @@ static void object_get_datamask(const Depsgraph *depsgraph, } void makeDerivedMesh(struct Depsgraph *depsgraph, - Scene *scene, + const Scene *scene, Object *ob, const CustomData_MeshMasks *dataMask) { @@ -1790,7 +1790,7 @@ void makeDerivedMesh(struct Depsgraph *depsgraph, /***/ Mesh *mesh_get_eval_final(struct Depsgraph *depsgraph, - Scene *scene, + const Scene *scene, Object *ob, const CustomData_MeshMasks *dataMask) { @@ -1826,7 +1826,7 @@ Mesh *mesh_get_eval_final(struct Depsgraph *depsgraph, } Mesh *mesh_get_eval_deform(struct Depsgraph *depsgraph, - Scene *scene, + const Scene *scene, Object *ob, const CustomData_MeshMasks *dataMask) { @@ -1866,7 +1866,7 @@ Mesh *mesh_get_eval_deform(struct Depsgraph *depsgraph, } Mesh *mesh_create_eval_final(Depsgraph *depsgraph, - Scene *scene, + const Scene *scene, Object *ob, const CustomData_MeshMasks *dataMask) { @@ -1877,7 +1877,7 @@ Mesh *mesh_create_eval_final(Depsgraph *depsgraph, } Mesh *mesh_create_eval_no_deform(Depsgraph *depsgraph, - Scene *scene, + const Scene *scene, Object *ob, const CustomData_MeshMasks *dataMask) { @@ -1888,7 +1888,7 @@ Mesh *mesh_create_eval_no_deform(Depsgraph *depsgraph, } Mesh *mesh_create_eval_no_deform_render(Depsgraph *depsgraph, - Scene *scene, + const Scene *scene, Object *ob, const CustomData_MeshMasks *dataMask) { @@ -1901,7 +1901,7 @@ Mesh *mesh_create_eval_no_deform_render(Depsgraph *depsgraph, /***/ Mesh *editbmesh_get_eval_cage(struct Depsgraph *depsgraph, - Scene *scene, + const Scene *scene, Object *obedit, BMEditMesh *em, const CustomData_MeshMasks *dataMask) @@ -1922,12 +1922,12 @@ Mesh *editbmesh_get_eval_cage(struct Depsgraph *depsgraph, } Mesh *editbmesh_get_eval_cage_from_orig(struct Depsgraph *depsgraph, - Scene *scene, + const Scene *scene, Object *obedit, const CustomData_MeshMasks *dataMask) { BLI_assert((obedit->id.tag & LIB_TAG_COPIED_ON_WRITE) == 0); - Scene *scene_eval = (Scene *)DEG_get_evaluated_id(depsgraph, &scene->id); + const Scene *scene_eval = (const Scene *)DEG_get_evaluated_id(depsgraph, (ID *)&scene->id); Object *obedit_eval = (Object *)DEG_get_evaluated_id(depsgraph, &obedit->id); BMEditMesh *em_eval = BKE_editmesh_from_object(obedit_eval); return editbmesh_get_eval_cage(depsgraph, scene_eval, obedit_eval, em_eval, dataMask); diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index dae6c5a319f..ffd0a03fc51 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -1488,7 +1488,7 @@ void BKE_sculptsession_free(Object *ob) } } -MultiresModifierData *BKE_sculpt_multires_active(Scene *scene, Object *ob) +MultiresModifierData *BKE_sculpt_multires_active(const Scene *scene, Object *ob) { Mesh *me = (Mesh *)ob->data; ModifierData *md; -- cgit v1.2.3