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>2018-08-29 18:36:52 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-08-29 18:38:16 +0300
commit0efecba957eea45621c004217a76448f11f0376d (patch)
tree26a11c55c969a8c4389f9797f5e46b3d7ed186fc /source/blender/modifiers
parent21105e1b1f1266a3846462588bdbe840d09758ea (diff)
parent39eb05161690510ecec4c30129a9f8d5532d39c9 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r--source/blender/modifiers/intern/MOD_bevel.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c
index ef447ff30ec..a961208755d 100644
--- a/source/blender/modifiers/intern/MOD_bevel.c
+++ b/source/blender/modifiers/intern/MOD_bevel.c
@@ -283,8 +283,8 @@ static void bevel_fix_normal_shading_continuity(BevelModifierData *bmd, BMesh *b
if (f_b)
has_f_b = BLI_ghash_haskey(faceHash, f_b);
if (has_f_a ^ has_f_b) {
- /* If one of both faces is present in faceHash then we are at a border
- * between new vmesh created and reconstructed face */
+ /* If one of both faces is present in faceHash then we are at a border
+ * between new vmesh created and reconstructed face */
for (int i = 0; i < 2; i++) {
BMVert *v = (i == 0) ? e->v1 : e->v2;
@@ -316,8 +316,8 @@ static void bevel_fix_normal_shading_continuity(BevelModifierData *bmd, BMesh *b
}
}
else if (has_f_a == true && has_f_b == true) {
- /* Else if both faces are present we assign clnor corresponding
- * to vert normal and face normal */
+ /* Else if both faces are present we assign clnor corresponding
+ * to vert normal and face normal */
for (int i = 0; i < 2; i++) {
BMVert *v = (i == 0) ? e->v1 : e->v2;
BM_ITER_ELEM(l, &liter, v, BM_LOOPS_OF_VERT) {