Revert "Fix T78296: Performance - Use Binary Search for MDeformWeight"

This reverts commit 39b525e0f07fa25dcda54226ade789959b642dec and
3121015dceb1d269d79690c8f15c8e1406c9b09f as tests are failing.

2 files changed, 0 insertions, 26 deletions

diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c
index a99da5eb333..0d16b58d28f 100644
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@ -27,9 +27,6 @@
 #include "DNA_constraint_types.h"
 #include "DNA_genfile.h"
 #include "DNA_gpencil_modifier_types.h"
-#include "DNA_gpencil_types.h"
-#include "DNA_lattice_types.h"
-#include "DNA_mesh_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
 #include "DNA_screen_types.h"
@@ -37,7 +34,6 @@
 
 #include "BKE_collection.h"
 #include "BKE_colortools.h"
-#include "BKE_deform.h"
 #include "BKE_lib_id.h"
 #include "BKE_main.h"
 
@@ -358,26 +354,6 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
     }
   }
 
-  /* Make sure that all weights of MDeformVert are sorted. */
-  if (!MAIN_VERSION_ATLEAST(bmain, 290, 7)) {
-    for (Mesh *mesh = bmain->meshes.first; mesh != NULL; mesh = mesh->id.next) {
-      BKE_defvert_array_sort_weights(mesh->dvert, mesh->totvert);
-    }
-    for (Lattice *lt = bmain->lattices.first; lt != NULL; lt = lt->id.next) {
-      const int totvert = lt->pntsu * lt->pntsv * lt->pntsw;
-      BKE_defvert_array_sort_weights(lt->dvert, totvert);
-    }
-    for (bGPdata *gp = bmain->gpencils.first; gp != NULL; gp = gp->id.next) {
-      LISTBASE_FOREACH (bGPDlayer *, layer, &gp->layers) {
-        LISTBASE_FOREACH (bGPDframe *, frame, &layer->frames) {
-          LISTBASE_FOREACH (bGPDstroke *, stroke, &frame->strokes) {
-            BKE_defvert_array_sort_weights(stroke->dvert, stroke->totpoints);
-          }
-        }
-      }
-    }
-  }
-
   /**
    * Versioning code until next subversion bump goes here.
    *
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 29461298cea..4e2b4fef9a0 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -159,7 +159,6 @@
 #include "BKE_constraint.h"
 #include "BKE_curve.h"
 #include "BKE_curveprofile.h"
-#include "BKE_deform.h"
 #include "BKE_fcurve.h"
 #include "BKE_fcurve_driver.h"
 #include "BKE_global.h"  // for G
@@ -2045,7 +2044,6 @@ static void write_dverts(BlendWriter *writer, int count, MDeformVert *dvlist)
     /* Write deformation data for each dvert */
     for (int i = 0; i < count; i++) {
       if (dvlist[i].dw) {
-        BKE_DEFVERT_IS_SORTED_ASSERT(&dvlist[i]);
         BLO_write_struct_array(writer, MDeformWeight, dvlist[i].totweight, dvlist[i].dw);
       }
     }