diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-03-16 15:46:10 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-03-16 15:46:10 +0300 |
commit | 147bd16ed1bb3415b30408b0eab110d0854eadd2 (patch) | |
tree | 8b232d5867b47e7364aa6d1db1c2a519096ec507 /source/blender/blenkernel/intern/mesh_evaluate.c | |
parent | e7a33d8bf4c736efe7e99fe780b3664543c365a0 (diff) | |
parent | 86c828d9fdf6df9f392f70d8ed1f0e10ce10e098 (diff) |
Merge branch 'master' into temp-ghash-experiments
Diffstat (limited to 'source/blender/blenkernel/intern/mesh_evaluate.c')
-rw-r--r-- | source/blender/blenkernel/intern/mesh_evaluate.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c index 40a09eba658..6c835a72a40 100644 --- a/source/blender/blenkernel/intern/mesh_evaluate.c +++ b/source/blender/blenkernel/intern/mesh_evaluate.c @@ -387,7 +387,9 @@ void BKE_lnor_space_define(MLoopNorSpace *lnor_space, const float lnor[3], BLI_stack_discard(edge_vectors); nbr++; } - BLI_assert(nbr > 2); /* This piece of code shall only be called for more than one loop... */ + /* Note: In theory, this could be 'nbr > 2', but there is one case where we only have two edges for + * two loops: a smooth vertex with only two edges and two faces (our Monkey's nose has that, e.g.). */ + BLI_assert(nbr >= 2); /* This piece of code shall only be called for more than one loop... */ lnor_space->ref_alpha = alpha / (float)nbr; } else { |