[Bf-blender-cvs] [b311d06a1d6] opensubdiv_compare: OpenSubdiv: Allow any order of edge topology/sharpness assignment

[Sergey Sharybin]

Commit: b311d06a1d68c8ee297350154629afd5e9f59d6a
Author: Sergey Sharybin
Date:   Tue May 26 12:37:03 2020 +0200
Branches: opensubdiv_compare
https://developer.blender.org/rBb311d06a1d68c8ee297350154629afd5e9f59d6a

OpenSubdiv: Allow any order of edge topology/sharpness assignment

Makes it possible to set adjacent vertices after edge sharpness.

Initially it seemed like useful sanity check, but with time it
became rather a burden.

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

M	intern/opensubdiv/internal/topology/mesh_topology.cc
M	intern/opensubdiv/internal/topology/mesh_topology.h

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

diff --git a/intern/opensubdiv/internal/topology/mesh_topology.cc b/intern/opensubdiv/internal/topology/mesh_topology.cc
index 4ff168cc508..3d8535ee2f1 100644
--- a/intern/opensubdiv/internal/topology/mesh_topology.cc
+++ b/intern/opensubdiv/internal/topology/mesh_topology.cc
@@ -103,11 +103,6 @@ void MeshTopology::setEdgeVertexIndices(int edge_index, int v1, int v2)
   ensureNumEdgesAtLeast(edge_index + 1);
 
   Edge &edge = edges_[edge_index];
-
-  // Prevent attempts to override edges.
-  // This is currently not supposed to happen.
-  assert(!edge.isValid());
-
   edge.v1 = v1;
   edge.v2 = v2;
 }
@@ -136,10 +131,6 @@ void MeshTopology::setEdgeSharpness(int edge_index, float sharpness)
   assert(edge_index >= 0);
   assert(edge_index < getNumEdges());
 
-  Edge &edge = edges_[edge_index];
-  assert(edge.isValid());
-  (void)edge;
-
   if (sharpness < 1e-6f) {
     return;
   }
diff --git a/intern/opensubdiv/internal/topology/mesh_topology.h b/intern/opensubdiv/internal/topology/mesh_topology.h
index fd3267df38b..ddabc322a6e 100644
--- a/intern/opensubdiv/internal/topology/mesh_topology.h
+++ b/intern/opensubdiv/internal/topology/mesh_topology.h
@@ -145,11 +145,6 @@ class MeshTopology {
   };
 
   struct Edge {
-    bool isValid() const
-    {
-      return v1 >= 0 && v2 >= 0;
-    }
-
     int v1 = -1;
     int v2 = -1;
   };