[Bf-blender-cvs] [60fbed3dba9] blender-v2.90-release: Fix T80520: Tris to Quads ignores UV delimit option

mano-wii noreply at git.blender.org
Mon Sep 21 09:50:39 CEST 2020


Commit: 60fbed3dba9f7cafd134f7a6dfe2892252a2d54b
Author: mano-wii
Date:   Mon Sep 21 15:01:46 2020 +1000
Branches: blender-v2.90-release
https://developer.blender.org/rB60fbed3dba9f7cafd134f7a6dfe2892252a2d54b

Fix T80520: Tris to Quads ignores UV delimit option

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

M	source/blender/bmesh/operators/bmo_join_triangles.c

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

diff --git a/source/blender/bmesh/operators/bmo_join_triangles.c b/source/blender/bmesh/operators/bmo_join_triangles.c
index efb8b810581..1da4be57568 100644
--- a/source/blender/bmesh/operators/bmo_join_triangles.c
+++ b/source/blender/bmesh/operators/bmo_join_triangles.c
@@ -166,7 +166,7 @@ static bool bm_edge_delimit_cdata(CustomData *ldata,
   r_delim_cd->cd_type = type;
   r_delim_cd->cd_size = CustomData_sizeof(r_delim_cd->cd_type);
   r_delim_cd->cd_offset = CustomData_get_n_offset(ldata, type, 0);
-  r_delim_cd->cd_offset_end = r_delim_cd->cd_size * layer_len;
+  r_delim_cd->cd_offset_end = r_delim_cd->cd_offset + (r_delim_cd->cd_size * layer_len);
   return (r_delim_cd->cd_offset != -1);
 }



More information about the Bf-blender-cvs mailing list