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
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-05-31 16:21:16 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-05-31 16:22:52 +0300
commitaba4e6810f8b4d0e459137b64e061a2cadc457d1 (patch)
tree2b6159c7ba0f23c020600b71276772fa4a882b5b /source/blender/editors/armature
parent72a563cdee8fef198a200ff65b57ddb847c01795 (diff)
Cleanup: style, use braces in source/ (include disabled blocks)
Diffstat (limited to 'source/blender/editors/armature')
-rw-r--r--source/blender/editors/armature/meshlaplacian.c21
-rw-r--r--source/blender/editors/armature/pose_edit.c6
2 files changed, 18 insertions, 9 deletions
diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c
index 81030c7f199..6bf507df421 100644
--- a/source/blender/editors/armature/meshlaplacian.c
+++ b/source/blender/editors/armature/meshlaplacian.c
@@ -1198,17 +1198,21 @@ static void meshdeform_bind_floodfill(MeshDeformBind *mdb)
{
int tb, ti, te, ts;
tb = ti = te = ts = 0;
- for (a = 0; a < size * size * size; a++)
- if (tag[a] == MESHDEFORM_TAG_BOUNDARY)
+ for (a = 0; a < size * size * size; a++) {
+ if (tag[a] == MESHDEFORM_TAG_BOUNDARY) {
tb++;
- else if (tag[a] == MESHDEFORM_TAG_INTERIOR)
+ }
+ else if (tag[a] == MESHDEFORM_TAG_INTERIOR) {
ti++;
+ }
else if (tag[a] == MESHDEFORM_TAG_EXTERIOR) {
te++;
- if (mdb->semibound[a])
+ if (mdb->semibound[a]) {
ts++;
+ }
}
+ }
printf("interior %d exterior %d boundary %d semi-boundary %d\n", ti, te, tb, ts);
}
@@ -1557,14 +1561,17 @@ static void meshdeform_matrix_solve(MeshDeformModifierData *mmd, MeshDeformBind
#if 0
/* sanity check */
- for (b = 0; b < mdb->size3; b++)
- if (mdb->tag[b] != MESHDEFORM_TAG_EXTERIOR)
- if (fabsf(mdb->totalphi[b] - 1.0f) > 1e-4f)
+ for (b = 0; b < mdb->size3; b++) {
+ if (mdb->tag[b] != MESHDEFORM_TAG_EXTERIOR) {
+ if (fabsf(mdb->totalphi[b] - 1.0f) > 1e-4f) {
printf("totalphi deficiency [%s|%d] %d: %.10f\n",
(mdb->tag[b] == MESHDEFORM_TAG_INTERIOR) ? "interior" : "boundary",
mdb->semibound[b],
mdb->varidx[b],
mdb->totalphi[b]);
+ }
+ }
+ }
#endif
/* free */
diff --git a/source/blender/editors/armature/pose_edit.c b/source/blender/editors/armature/pose_edit.c
index 954beda7777..745af06c7af 100644
--- a/source/blender/editors/armature/pose_edit.c
+++ b/source/blender/editors/armature/pose_edit.c
@@ -162,14 +162,16 @@ static bool pose_has_protected_selected(Object *ob, short warn)
for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
if (pchan->bone && (pchan->bone->layer & arm->layer)) {
if (pchan->bone->layer & arm->layer_protected) {
- if (pchan->bone->flag & BONE_SELECTED)
+ if (pchan->bone->flag & BONE_SELECTED) {
break;
+ }
}
}
}
if (pchan) {
- if (warn)
+ if (warn) {
error("Cannot change Proxy protected bones");
+ }
return 1;
}
}