[Bf-blender-cvs] [b5c3dbc3596] soc-2019-npr: Fix assert in some cases when using DataTransfer modifier for custom normals.

Bastien Montagne noreply at git.blender.org
Mon Jul 22 02:55:00 CEST 2019


Commit: b5c3dbc35969c26ce181c90b65a523e73509485d
Author: Bastien Montagne
Date:   Fri Jul 19 16:10:20 2019 +0200
Branches: soc-2019-npr
https://developer.blender.org/rBb5c3dbc35969c26ce181c90b65a523e73509485d

Fix assert in some cases when using DataTransfer modifier for custom normals.

Reported by @sybren on IRC, thanks.

Should be safe for 2.80.

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

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 1adae46990e..4d5f78a17a9 100644
--- a/source/blender/blenkernel/intern/data_transfer.c
+++ b/source/blender/blenkernel/intern/data_transfer.c
@@ -1,3 +1,4 @@
+
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -85,6 +86,7 @@ void BKE_object_data_transfer_dttypes_to_cdmask(const int dtdata_types,
     }
     else if (cddata_type == CD_FAKE_LNOR) {
       r_data_masks->vmask |= CD_MASK_NORMAL;
+      r_data_masks->pmask |= CD_MASK_NORMAL;
       r_data_masks->lmask |= CD_MASK_NORMAL | CD_MASK_CUSTOMLOOPNORMAL;
     }
   }



More information about the Bf-blender-cvs mailing list