From 827959ff98e77739e5753789ad645d4b53cca3c9 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 13 Jun 2020 16:08:34 +1000 Subject: Cleanup: use const arguments to deform functions This changes curve deform code not to set the objects inverse matrix, this shouldn't cause problems as it's not used elsewhere afterwards. --- source/blender/blenkernel/intern/armature_deform.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'source/blender/blenkernel/intern/armature_deform.c') diff --git a/source/blender/blenkernel/intern/armature_deform.c b/source/blender/blenkernel/intern/armature_deform.c index e180070f518..e757e30e524 100644 --- a/source/blender/blenkernel/intern/armature_deform.c +++ b/source/blender/blenkernel/intern/armature_deform.c @@ -240,8 +240,8 @@ static void pchan_bone_deform(bPoseChannel *pchan, * \{ */ typedef struct ArmatureUserdata { - Object *ob_arm; - Object *ob_target; + const Object *ob_arm; + const Object *ob_target; const Mesh *me_target; float (*vert_coords)[3]; float (*vert_deform_mats)[3][3]; @@ -462,8 +462,8 @@ static void armature_vert_task_editmesh_no_dvert(void *__restrict userdata, Memp armature_vert_task_with_dvert(data, BM_elem_index_get(v), NULL); } -static void armature_deform_coords_impl(Object *ob_arm, - Object *ob_target, +static void armature_deform_coords_impl(const Object *ob_arm, + const Object *ob_target, float (*vert_coords)[3], float (*vert_deform_mats)[3][3], const int vert_coords_len, @@ -616,8 +616,8 @@ static void armature_deform_coords_impl(Object *ob_arm, } } -void BKE_armature_deform_coords_with_gpencil_stroke(Object *ob_arm, - Object *ob_target, +void BKE_armature_deform_coords_with_gpencil_stroke(const Object *ob_arm, + const Object *ob_target, float (*vert_coords)[3], float (*vert_deform_mats)[3][3], int vert_coords_len, @@ -639,8 +639,8 @@ void BKE_armature_deform_coords_with_gpencil_stroke(Object *ob_arm, gps_target); } -void BKE_armature_deform_coords_with_mesh(Object *ob_arm, - Object *ob_target, +void BKE_armature_deform_coords_with_mesh(const Object *ob_arm, + const Object *ob_target, float (*vert_coords)[3], float (*vert_deform_mats)[3][3], int vert_coords_len, @@ -662,8 +662,8 @@ void BKE_armature_deform_coords_with_mesh(Object *ob_arm, NULL); } -void BKE_armature_deform_coords_with_editmesh(Object *ob_arm, - Object *ob_target, +void BKE_armature_deform_coords_with_editmesh(const Object *ob_arm, + const Object *ob_target, float (*vert_coords)[3], float (*vert_deform_mats)[3][3], int vert_coords_len, -- cgit v1.2.3