From 8cd17a9529473e0bda31a9d33cdb7bdd58524600 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Tue, 26 May 2020 12:37:03 +0200
Subject: 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.
---
 intern/opensubdiv/internal/topology/mesh_topology.cc | 9 ---------
 intern/opensubdiv/internal/topology/mesh_topology.h  | 5 -----
 2 files changed, 14 deletions(-)

(limited to 'intern')

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;
   };
-- 
cgit v1.2.3