[Bf-blender-cvs] [179605bd2da] master: Fix T104168: No active UV when reading auto-save files

Hans Goudey noreply at git.blender.org
Fri Jan 27 17:00:17 CET 2023


Commit: 179605bd2dab1df3339ef6b625fd38f8bee84914
Author: Hans Goudey
Date:   Fri Jan 27 09:56:14 2023 -0600
Branches: master
https://developer.blender.org/rB179605bd2dab1df3339ef6b625fd38f8bee84914

Fix T104168: No active UV when reading auto-save files

Similar to 6d12d43a054898bbffb, we should skip the
legacy to generic conversion if there's nothing to convert.

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

M	source/blender/blenkernel/intern/mesh_legacy_convert.cc

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

diff --git a/source/blender/blenkernel/intern/mesh_legacy_convert.cc b/source/blender/blenkernel/intern/mesh_legacy_convert.cc
index a60dfa3a19c..4926be66d27 100644
--- a/source/blender/blenkernel/intern/mesh_legacy_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_legacy_convert.cc
@@ -1608,6 +1608,9 @@ void BKE_mesh_legacy_convert_uvs_to_generic(Mesh *mesh)
 {
   using namespace blender;
   using namespace blender::bke;
+  if (!CustomData_has_layer(&mesh->ldata, CD_MLOOPUV)) {
+    return;
+  }
 
   /* Store layer names since they will be removed, used to set the active status of new layers.
    * Use intermediate #StringRef because the names can be null. */



More information about the Bf-blender-cvs mailing list