Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source/blender/editors/armature
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/armature')
-rw-r--r--source/blender/editors/armature/armature_select.c3
-rw-r--r--source/blender/editors/armature/armature_skinning.c32
-rw-r--r--source/blender/editors/armature/armature_utils.c15
-rw-r--r--source/blender/editors/armature/meshlaplacian.c22
-rw-r--r--source/blender/editors/armature/pose_edit.c3
-rw-r--r--source/blender/editors/armature/pose_group.c5
6 files changed, 36 insertions, 44 deletions
diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c
index 7fba855ffdb..4c5efb304c9 100644
--- a/source/blender/editors/armature/armature_select.c
+++ b/source/blender/editors/armature/armature_select.c
@@ -177,11 +177,10 @@ static void *ed_armature_pick_bone_from_selectbuffer_impl(const bool is_editmode
void *firstunSel = NULL, *firstSel = NULL, *data;
Base *firstunSel_base = NULL, *firstSel_base = NULL;
uint hitresult;
- short i;
bool takeNext = false;
int minsel = 0xffffffff, minunsel = 0xffffffff;
- for (i = 0; i < hits; i++) {
+ for (short i = 0; i < hits; i++) {
hitresult = buffer[3 + (i * 4)];
if (hitresult & BONESEL_ANY) { /* to avoid including objects in selection */
diff --git a/source/blender/editors/armature/armature_skinning.c b/source/blender/editors/armature/armature_skinning.c
index ea9b0eb92b9..aa742d4b7ba 100644
--- a/source/blender/editors/armature/armature_skinning.c
+++ b/source/blender/editors/armature/armature_skinning.c
@@ -212,10 +212,6 @@ static void envelope_bone_weighting(Object *ob,
{
/* Create vertex group weights from envelopes */
- Bone *bone;
- bDeformGroup *dgroup;
- float distance;
- int i, iflip, j;
bool use_topology = (mesh->editflag & ME_EDIT_MIRROR_TOPO) != 0;
bool use_mask = false;
@@ -225,30 +221,30 @@ static void envelope_bone_weighting(Object *ob,
}
/* for each vertex in the mesh */
- for (i = 0; i < mesh->totvert; i++) {
+ for (int i = 0; i < mesh->totvert; i++) {
if (use_mask && !(mesh->mvert[i].flag & SELECT)) {
continue;
}
- iflip = (dgroupflip) ? mesh_get_x_mirror_vert(ob, NULL, i, use_topology) : -1;
+ int iflip = (dgroupflip) ? mesh_get_x_mirror_vert(ob, NULL, i, use_topology) : -1;
/* for each skinnable bone */
- for (j = 0; j < numbones; j++) {
+ for (int j = 0; j < numbones; j++) {
if (!selected[j]) {
continue;
}
- bone = bonelist[j];
- dgroup = dgrouplist[j];
+ Bone *bone = bonelist[j];
+ bDeformGroup *dgroup = dgrouplist[j];
/* store the distance-factor from the vertex to the bone */
- distance = distfactor_to_bone(verts[i],
- root[j],
- tip[j],
- bone->rad_head * scale,
- bone->rad_tail * scale,
- bone->dist * scale);
+ float distance = distfactor_to_bone(verts[i],
+ root[j],
+ tip[j],
+ bone->rad_head * scale,
+ bone->rad_tail * scale,
+ bone->dist * scale);
/* add the vert to the deform group if (weight != 0.0) */
if (distance != 0.0f) {
@@ -300,7 +296,7 @@ static void add_verts_to_dgroups(ReportList *reports,
Mat4 bbone_array[MAX_BBONE_SUBDIV], *bbone = NULL;
float(*root)[3], (*tip)[3], (*verts)[3];
int *selected;
- int numbones, vertsfilled = 0, i, j, segments = 0;
+ int numbones, vertsfilled = 0, segments = 0;
const bool wpmode = (ob->mode & OB_MODE_WEIGHT_PAINT);
struct {
Object *armob;
@@ -346,7 +342,7 @@ static void add_verts_to_dgroups(ReportList *reports,
tip = MEM_callocN(sizeof(float[3]) * numbones, "tip");
selected = MEM_callocN(sizeof(int) * numbones, "selected");
- for (j = 0; j < numbones; j++) {
+ for (int j = 0; j < numbones; j++) {
bone = bonelist[j];
dgroup = dgrouplist[j];
@@ -427,7 +423,7 @@ static void add_verts_to_dgroups(ReportList *reports,
}
/* transform verts to global space */
- for (i = 0; i < mesh->totvert; i++) {
+ for (int i = 0; i < mesh->totvert; i++) {
if (!vertsfilled) {
copy_v3_v3(verts[i], mesh->mvert[i].co);
}
diff --git a/source/blender/editors/armature/armature_utils.c b/source/blender/editors/armature/armature_utils.c
index 04c1ec97841..1c8c5ba9d94 100644
--- a/source/blender/editors/armature/armature_utils.c
+++ b/source/blender/editors/armature/armature_utils.c
@@ -198,27 +198,26 @@ bool ED_armature_ebone_is_child_recursive(EditBone *ebone_parent, EditBone *ebon
*/
EditBone *ED_armature_ebone_find_shared_parent(EditBone *ebone_child[], const uint ebone_child_tot)
{
- uint i;
- EditBone *ebone_iter;
-
#define EBONE_TEMP_UINT(ebone) (*((uint *)(&((ebone)->temp))))
/* clear all */
- for (i = 0; i < ebone_child_tot; i++) {
- for (ebone_iter = ebone_child[i]; ebone_iter; ebone_iter = ebone_iter->parent) {
+ for (uint i = 0; i < ebone_child_tot; i++) {
+ for (EditBone *ebone_iter = ebone_child[i]; ebone_iter; ebone_iter = ebone_iter->parent) {
EBONE_TEMP_UINT(ebone_iter) = 0;
}
}
/* accumulate */
- for (i = 0; i < ebone_child_tot; i++) {
- for (ebone_iter = ebone_child[i]->parent; ebone_iter; ebone_iter = ebone_iter->parent) {
+ for (uint i = 0; i < ebone_child_tot; i++) {
+ for (EditBone *ebone_iter = ebone_child[i]->parent; ebone_iter;
+ ebone_iter = ebone_iter->parent) {
EBONE_TEMP_UINT(ebone_iter) += 1;
}
}
/* only need search the first chain */
- for (ebone_iter = ebone_child[0]->parent; ebone_iter; ebone_iter = ebone_iter->parent) {
+ for (EditBone *ebone_iter = ebone_child[0]->parent; ebone_iter;
+ ebone_iter = ebone_iter->parent) {
if (EBONE_TEMP_UINT(ebone_iter) == ebone_child_tot) {
return ebone_iter;
}
diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c
index 1534ea3287f..cf64cfc849d 100644
--- a/source/blender/editors/armature/meshlaplacian.c
+++ b/source/blender/editors/armature/meshlaplacian.c
@@ -1041,7 +1041,6 @@ static MDefBoundIsect *meshdeform_ray_tree_intersect(MeshDeformBind *mdb,
MDefBoundIsect *isect;
float(*mp_cagecos)[3] = BLI_array_alloca(mp_cagecos, mp->totloop);
- int i;
/* create MDefBoundIsect, and extra for 'poly_weights[]' */
isect = BLI_memarena_alloc(mdb->memarena, sizeof(*isect) + (sizeof(float) * mp->totloop));
@@ -1056,7 +1055,7 @@ static MDefBoundIsect *meshdeform_ray_tree_intersect(MeshDeformBind *mdb,
isect->len = max_ff(len_v3v3(co1, isect->co), MESHDEFORM_LEN_THRESHOLD);
/* compute mean value coordinates for interpolation */
- for (i = 0; i < mp->totloop; i++) {
+ for (int i = 0; i < mp->totloop; i++) {
copy_v3_v3(mp_cagecos[i], cagecos[mloop[mp->loopstart + i].v]);
}
@@ -1225,9 +1224,8 @@ static float meshdeform_boundary_phi(const MeshDeformBind *mdb,
{
const MLoop *mloop = mdb->cagemesh_cache.mloop;
const MPoly *mp = &mdb->cagemesh_cache.mpoly[isect->poly_index];
- int i;
- for (i = 0; i < mp->totloop; i++) {
+ for (int i = 0; i < mp->totloop; i++) {
if (mloop[mp->loopstart + i].v == cagevert) {
return isect->poly_weights[i];
}
@@ -1241,16 +1239,18 @@ static float meshdeform_interp_w(MeshDeformBind *mdb,
float *UNUSED(vec),
int UNUSED(cagevert))
{
- float dvec[3], ivec[3], wx, wy, wz, result = 0.0f;
- float weight, totweight = 0.0f;
- int i, a, x, y, z;
+ float dvec[3], ivec[3], result = 0.0f;
+ float totweight = 0.0f;
- for (i = 0; i < 3; i++) {
+ for (int i = 0; i < 3; i++) {
ivec[i] = (int)gridvec[i];
dvec[i] = gridvec[i] - ivec[i];
}
- for (i = 0; i < 8; i++) {
+ for (int i = 0; i < 8; i++) {
+ int x, y, z;
+ float wx, wy, wz;
+
if (i & 1) {
x = ivec[0] + 1;
wx = dvec[0];
@@ -1282,8 +1282,8 @@ static float meshdeform_interp_w(MeshDeformBind *mdb,
CLAMP(y, 0, mdb->size - 1);
CLAMP(z, 0, mdb->size - 1);
- a = meshdeform_index(mdb, x, y, z, 0);
- weight = wx * wy * wz;
+ int a = meshdeform_index(mdb, x, y, z, 0);
+ float weight = wx * wy * wz;
result += weight * mdb->phi[a];
totweight += weight;
}
diff --git a/source/blender/editors/armature/pose_edit.c b/source/blender/editors/armature/pose_edit.c
index 0cd3afc9cf9..85948f3abc3 100644
--- a/source/blender/editors/armature/pose_edit.c
+++ b/source/blender/editors/armature/pose_edit.c
@@ -742,7 +742,6 @@ static int pose_armature_layers_showall_exec(bContext *C, wmOperator *op)
int maxLayers = (RNA_boolean_get(op->ptr, "all")) ? 32 : 16;
/* hardcoded for now - we can only have 32 armature layers, so this should be fine... */
bool layers[32] = {false};
- int i;
/* sanity checking */
if (arm == NULL) {
@@ -755,7 +754,7 @@ static int pose_armature_layers_showall_exec(bContext *C, wmOperator *op)
*/
RNA_id_pointer_create(&arm->id, &ptr);
- for (i = 0; i < maxLayers; i++) {
+ for (int i = 0; i < maxLayers; i++) {
layers[i] = 1;
}
diff --git a/source/blender/editors/armature/pose_group.c b/source/blender/editors/armature/pose_group.c
index cb7c68178d9..ffa28bf9e36 100644
--- a/source/blender/editors/armature/pose_group.c
+++ b/source/blender/editors/armature/pose_group.c
@@ -381,8 +381,6 @@ static int group_sort_exec(bContext *C, wmOperator *UNUSED(op))
bPoseChannel *pchan;
tSortActionGroup *agrp_array;
bActionGroup *agrp;
- int agrp_count;
- int i;
if (ELEM(NULL, ob, pose)) {
return OPERATOR_CANCELLED;
@@ -392,8 +390,9 @@ static int group_sort_exec(bContext *C, wmOperator *UNUSED(op))
}
/* create temporary array with bone groups and indices */
- agrp_count = BLI_listbase_count(&pose->agroups);
+ int agrp_count = BLI_listbase_count(&pose->agroups);
agrp_array = MEM_mallocN(sizeof(tSortActionGroup) * agrp_count, "sort bone groups");
+ int i;
for (agrp = pose->agroups.first, i = 0; agrp; agrp = agrp->next, i++) {
BLI_assert(i < agrp_count);
agrp_array[i].agrp = agrp;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 14:49:34 +0300