[Bf-blender-cvs] [1b54fd391e5] blender-v3.2-release: Revert "Fix T98773: GPU Subdivision breaks auto selection in UV edit mode"

Thomas Dinges noreply at git.blender.org
Tue Jul 5 16:31:16 CEST 2022


Commit: 1b54fd391e5b2a8fbf9183df8caa15a8a5cb81d2
Author: Thomas Dinges
Date:   Tue Jul 5 16:26:52 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rB1b54fd391e5b2a8fbf9183df8caa15a8a5cb81d2

Revert "Fix T98773: GPU Subdivision breaks auto selection in UV edit mode"

This reverts commit e2c02655c78b2c669468ae568ddf4b17953cc98d.

It caused regression T99323 which is more severe than the original fixed T98773.

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

M	source/blender/draw/intern/draw_cache_extract_mesh_render_data.c

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

diff --git a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.c b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.c
index 4fb1b9a7bc7..0a93f346b37 100644
--- a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.c
+++ b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.c
@@ -502,8 +502,8 @@ MeshRenderData *mesh_render_data_create(Object *object,
 
     /* Seems like the mesh_eval_final do not have the right origin indices.
      * Force not mapped in this case. */
-    if (use_mapped && do_final && editmesh_eval_final != editmesh_eval_cage) {
-      // mr->edit_bmesh = nullptr;
+    if (has_mdata && do_final && editmesh_eval_final != editmesh_eval_cage) {
+      // mr->edit_bmesh = NULL;
       mr->extract_type = MR_EXTRACT_MESH;
     }
   }



More information about the Bf-blender-cvs mailing list