[Bf-blender-cvs] [54fa78a0480] blender2.8: BLI_edgehash: assert when edges use the same vert

Campbell Barton noreply at git.blender.org
Thu Dec 13 12:46:17 CET 2018


Commit: 54fa78a048084bc3bebb7ca23594d00493cf0550
Author: Campbell Barton
Date:   Thu Dec 13 22:44:09 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB54fa78a048084bc3bebb7ca23594d00493cf0550

BLI_edgehash: assert when edges use the same vert

This was removed on the recent upgrade.

===================================================================

M	source/blender/blenlib/intern/edgehash.c

===================================================================

diff --git a/source/blender/blenlib/intern/edgehash.c b/source/blender/blenlib/intern/edgehash.c
index 996c815a062..7061c1b8702 100644
--- a/source/blender/blenlib/intern/edgehash.c
+++ b/source/blender/blenlib/intern/edgehash.c
@@ -94,6 +94,9 @@ BLI_INLINE uint32_t calc_edge_hash(Edge edge)
 
 BLI_INLINE Edge init_edge(uint v0, uint v1)
 {
+	/* If there are use cases where we need this it could be removed (or flag to allow),
+	 * for now this helps avoid incorrect usage (creating degenerate geometry). */
+	BLI_assert(v0 != v1);
 	Edge edge;
 	if (v0 < v1) {
 		edge.v_low = v0;



More information about the Bf-blender-cvs mailing list