Commit: 35d2a2284659ca0e308d37765b803a66157de2f7 Author: Hans Goudey Date: Fri Jun 24 16:16:43 2022 -0500 Branches: master https://developer.blender.org/rB35d2a2284659ca0e308d37765b803a66157de2f7
Cleanup: Remove unused argument =================================================================== M source/blender/blenkernel/BKE_mesh_wrapper.h M source/blender/blenkernel/intern/mesh_convert.cc M source/blender/blenkernel/intern/mesh_wrapper.cc M source/blender/blenkernel/intern/object.cc M source/blender/editors/space_view3d/view3d_iterators.c M source/blender/makesrna/intern/rna_object.c =================================================================== diff --git a/source/blender/blenkernel/BKE_mesh_wrapper.h b/source/blender/blenkernel/BKE_mesh_wrapper.h index f664c703def..b4742583b03 100644 --- a/source/blender/blenkernel/BKE_mesh_wrapper.h +++ b/source/blender/blenkernel/BKE_mesh_wrapper.h @@ -38,7 +38,7 @@ void BKE_mesh_wrapper_vert_coords_copy_with_mat4(const struct Mesh *me, int vert_coords_len, const float mat[4][4]); -struct Mesh *BKE_mesh_wrapper_ensure_subdivision(const struct Object *ob, struct Mesh *me); +struct Mesh *BKE_mesh_wrapper_ensure_subdivision(struct Mesh *me); #ifdef __cplusplus } diff --git a/source/blender/blenkernel/intern/mesh_convert.cc b/source/blender/blenkernel/intern/mesh_convert.cc index 48c49055899..9cb3e684667 100644 --- a/source/blender/blenkernel/intern/mesh_convert.cc +++ b/source/blender/blenkernel/intern/mesh_convert.cc @@ -1028,7 +1028,7 @@ static Mesh *mesh_new_from_mesh(Object *object, Mesh *mesh) BKE_mesh_wrapper_ensure_mdata(mesh); } else { - mesh = BKE_mesh_wrapper_ensure_subdivision(object, mesh); + mesh = BKE_mesh_wrapper_ensure_subdivision(mesh); } Mesh *mesh_result = (Mesh *)BKE_id_copy_ex( @@ -1065,7 +1065,7 @@ static Mesh *mesh_new_from_mesh_object_with_layers(Depsgraph *depsgraph, mask.pmask |= CD_MASK_ORIGINDEX; } Mesh *result = mesh_create_eval_final(depsgraph, scene, &object_for_eval, &mask); - return BKE_mesh_wrapper_ensure_subdivision(object, result); + return BKE_mesh_wrapper_ensure_subdivision(result); } static Mesh *mesh_new_from_mesh_object(Depsgraph *depsgraph, diff --git a/source/blender/blenkernel/intern/mesh_wrapper.cc b/source/blender/blenkernel/intern/mesh_wrapper.cc index 48a29b2aad3..0362e4866e3 100644 --- a/source/blender/blenkernel/intern/mesh_wrapper.cc +++ b/source/blender/blenkernel/intern/mesh_wrapper.cc @@ -307,7 +307,7 @@ int BKE_mesh_wrapper_poly_len(const Mesh *me) /** \name CPU Subdivision Evaluation * \{ */ -static Mesh *mesh_wrapper_ensure_subdivision(const Object *ob, Mesh *me) +static Mesh *mesh_wrapper_ensure_subdivision(Mesh *me) { SubsurfRuntimeData *runtime_data = (SubsurfRuntimeData *)me->runtime.subsurf_runtime_data; if (runtime_data == nullptr || runtime_data->settings.level == 0) { @@ -367,7 +367,7 @@ static Mesh *mesh_wrapper_ensure_subdivision(const Object *ob, Mesh *me) return me->runtime.mesh_eval; } -Mesh *BKE_mesh_wrapper_ensure_subdivision(const Object *ob, Mesh *me) +Mesh *BKE_mesh_wrapper_ensure_subdivision(Mesh *me) { ThreadMutex *mesh_eval_mutex = (ThreadMutex *)me->runtime.eval_mutex; BLI_mutex_lock(mesh_eval_mutex); @@ -380,7 +380,7 @@ Mesh *BKE_mesh_wrapper_ensure_subdivision(const Object *ob, Mesh *me) Mesh *result; /* Must isolate multithreaded tasks while holding a mutex lock. */ - blender::threading::isolate_task([&]() { result = mesh_wrapper_ensure_subdivision(ob, me); }); + blender::threading::isolate_task([&]() { result = mesh_wrapper_ensure_subdivision(me); }); BLI_mutex_unlock(mesh_eval_mutex); return result; diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc index c8b87c27697..94b606d6a02 100644 --- a/source/blender/blenkernel/intern/object.cc +++ b/source/blender/blenkernel/intern/object.cc @@ -4318,7 +4318,7 @@ Mesh *BKE_object_get_evaluated_mesh(const Object *object) } if (object->data && GS(((const ID *)object->data)->name) == ID_ME) { - mesh = BKE_mesh_wrapper_ensure_subdivision(object, mesh); + mesh = BKE_mesh_wrapper_ensure_subdivision(mesh); } return mesh; diff --git a/source/blender/editors/space_view3d/view3d_iterators.c b/source/blender/editors/space_view3d/view3d_iterators.c index 4606908b91f..35d4746608b 100644 --- a/source/blender/editors/space_view3d/view3d_iterators.c +++ b/source/blender/editors/space_view3d/view3d_iterators.c @@ -335,7 +335,7 @@ void mesh_foreachScreenVert( Mesh *me = editbmesh_get_eval_cage_from_orig( vc->depsgraph, vc->scene, vc->obedit, &CD_MASK_BAREMESH); - me = BKE_mesh_wrapper_ensure_subdivision(vc->obedit, me); + me = BKE_mesh_wrapper_ensure_subdivision(me); ED_view3d_check_mats_rv3d(vc->rv3d); @@ -398,7 +398,7 @@ void mesh_foreachScreenEdge(ViewContext *vc, Mesh *me = editbmesh_get_eval_cage_from_orig( vc->depsgraph, vc->scene, vc->obedit, &CD_MASK_BAREMESH); - me = BKE_mesh_wrapper_ensure_subdivision(vc->obedit, me); + me = BKE_mesh_wrapper_ensure_subdivision(me); ED_view3d_check_mats_rv3d(vc->rv3d); @@ -486,7 +486,7 @@ void mesh_foreachScreenEdge_clip_bb_segment(ViewContext *vc, Mesh *me = editbmesh_get_eval_cage_from_orig( vc->depsgraph, vc->scene, vc->obedit, &CD_MASK_BAREMESH); - me = BKE_mesh_wrapper_ensure_subdivision(vc->obedit, me); + me = BKE_mesh_wrapper_ensure_subdivision(me); ED_view3d_check_mats_rv3d(vc->rv3d); @@ -558,7 +558,7 @@ void mesh_foreachScreenFace( Mesh *me = editbmesh_get_eval_cage_from_orig( vc->depsgraph, vc->scene, vc->obedit, &CD_MASK_BAREMESH); - me = BKE_mesh_wrapper_ensure_subdivision(vc->obedit, me); + me = BKE_mesh_wrapper_ensure_subdivision(me); ED_view3d_check_mats_rv3d(vc->rv3d); data.vc = *vc; diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 56652a35ecb..46e8b3beb02 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -511,7 +511,7 @@ static PointerRNA rna_Object_data_get(PointerRNA *ptr) Object *ob = (Object *)ptr->data; if (ob->type == OB_MESH) { Mesh *me = (Mesh *)ob->data; - me = BKE_mesh_wrapper_ensure_subdivision(ob, me); + me = BKE_mesh_wrapper_ensure_subdivision(me); return rna_pointer_inherit_refine(ptr, &RNA_Mesh, me); } return rna_pointer_inherit_refine(ptr, &RNA_ID, ob->data); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs