[Bf-blender-cvs] [02d1f1482a5] master: Fix mistake in rBef90a8e12caf in data transfer code.

Bastien Montagne noreply at git.blender.org
Mon Jan 4 11:30:08 CET 2021


Commit: 02d1f1482a5e225bbb8195c04eaece1514aa97d1
Author: Bastien Montagne
Date:   Mon Jan 4 11:23:24 2021 +0100
Branches: master
https://developer.blender.org/rB02d1f1482a5e225bbb8195c04eaece1514aa97d1

Fix mistake in rBef90a8e12caf in data transfer code.

Old mistake from 2.80 era when we got rid of DerivedMesh...

Not critical, but could be backported to 2.90LTS too.

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

M	source/blender/blenkernel/intern/data_transfer.c

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

diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c
index 7a3a6ea44a9..2bf58d9e764 100644
--- a/source/blender/blenkernel/intern/data_transfer.c
+++ b/source/blender/blenkernel/intern/data_transfer.c
@@ -1053,7 +1053,7 @@ static bool data_transfer_layersmapping_generate(ListBase *r_map,
       const uint64_t data_flag = 0;
 
       if (!(me_src->cd_flag & ME_CDFLAG_EDGE_CREASE)) {
-        if (use_delete && !me_dst) {
+        if (use_delete) {
           me_dst->cd_flag &= ~ME_CDFLAG_EDGE_CREASE;
         }
         return true;
@@ -1085,7 +1085,7 @@ static bool data_transfer_layersmapping_generate(ListBase *r_map,
       const uint64_t data_flag = 0;
 
       if (!(me_src->cd_flag & ME_CDFLAG_EDGE_BWEIGHT)) {
-        if (use_delete && !me_dst) {
+        if (use_delete) {
           me_dst->cd_flag &= ~ME_CDFLAG_EDGE_BWEIGHT;
         }
         return true;



More information about the Bf-blender-cvs mailing list