diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-05-26 13:37:03 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-05-27 13:07:16 +0300 |
commit | 8cd17a9529473e0bda31a9d33cdb7bdd58524600 (patch) | |
tree | ae7331a6f47834e003638c82f27e578fcbf2299b /intern | |
parent | 42cb1e3a2c4c708df4506b735d29b5841c07d960 (diff) |
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.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/opensubdiv/internal/topology/mesh_topology.cc | 9 | ||||
-rw-r--r-- | intern/opensubdiv/internal/topology/mesh_topology.h | 5 |
2 files changed, 0 insertions, 14 deletions
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; }; |