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-04-22 02:15:10 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-22 12:48:16 +0300
commita25a7714c592dff1fc1b3b4b0888bf984fa9e6fd (patch)
tree31335c1e02de10d3c97f9fdbe98b71ebc410e451 /source/blender/modifiers/intern/MOD_weightvgproximity.c
parent6cc09d006af4a89cea14485e8e3896bd38a80e4b (diff)
Cleanup: style, use braces for modifiers
Diffstat (limited to 'source/blender/modifiers/intern/MOD_weightvgproximity.c')
-rw-r--r--source/blender/modifiers/intern/MOD_weightvgproximity.c39
1 files changed, 26 insertions, 13 deletions
diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c
index 66b7ddb54d6..9699b5f15dd 100644
--- a/source/blender/modifiers/intern/MOD_weightvgproximity.c
+++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c
@@ -194,12 +194,15 @@ static void get_vert2geom_distance(int numVerts,
settings.userdata_chunk_size = sizeof(data_chunk);
BLI_task_parallel_range(0, numVerts, &data, vert2geom_task_cb_ex, &settings);
- if (dist_v)
+ if (dist_v) {
free_bvhtree_from_mesh(&treeData_v);
- if (dist_e)
+ }
+ if (dist_e) {
free_bvhtree_from_mesh(&treeData_e);
- if (dist_f)
+ }
+ if (dist_f) {
free_bvhtree_from_mesh(&treeData_f);
+ }
}
/**
@@ -245,22 +248,28 @@ static void do_map(
}
else if (max_d > min_d) {
while (i-- > 0) {
- if (weights[i] >= max_d)
+ if (weights[i] >= max_d) {
weights[i] = 1.0f; /* most likely case first */
- else if (weights[i] <= min_d)
+ }
+ else if (weights[i] <= min_d) {
weights[i] = 0.0f;
- else
+ }
+ else {
weights[i] = (weights[i] - min_d) * range_inv;
+ }
}
}
else {
while (i-- > 0) {
- if (weights[i] <= max_d)
+ if (weights[i] <= max_d) {
weights[i] = 1.0f; /* most likely case first */
- else if (weights[i] >= min_d)
+ }
+ else if (weights[i] >= min_d) {
weights[i] = 0.0f;
- else
+ }
+ else {
weights[i] = (weights[i] - min_d) * range_inv;
+ }
}
}
@@ -318,8 +327,9 @@ static bool dependsOnTime(ModifierData *md)
{
WeightVGProximityModifierData *wmd = (WeightVGProximityModifierData *)md;
- if (wmd->mask_texture)
+ if (wmd->mask_texture) {
return BKE_texture_dependsOnTime(wmd->mask_texture);
+ }
return 0;
}
@@ -374,8 +384,9 @@ static bool isDisabled(const struct Scene *UNUSED(scene),
{
WeightVGProximityModifierData *wmd = (WeightVGProximityModifierData *)md;
/* If no vertex group, bypass. */
- if (wmd->defgrp_name[0] == '\0')
+ if (wmd->defgrp_name[0] == '\0') {
return 1;
+ }
/* If no target object, bypass. */
return (wmd->proximity_ob_target == NULL);
}
@@ -520,10 +531,12 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes
get_vert2geom_distance(numIdx, v_cos, dists_v, dists_e, dists_f, target_mesh, &loc2trgt);
for (i = 0; i < numIdx; i++) {
new_w[i] = dists_v ? dists_v[i] : FLT_MAX;
- if (dists_e)
+ if (dists_e) {
new_w[i] = min_ff(dists_e[i], new_w[i]);
- if (dists_f)
+ }
+ if (dists_f) {
new_w[i] = min_ff(dists_f[i], new_w[i]);
+ }
}
MEM_SAFE_FREE(dists_v);