[Bf-blender-cvs] [605749ffaaa] master: Modifiers Evaluation: generate loop normals when requested.
Bastien Montagne
noreply at git.blender.org
Thu Mar 7 16:25:40 CET 2019
Commit: 605749ffaaa1dc004eb8595c2b5c3bad00f2bb34
Author: Bastien Montagne
Date: Thu Mar 7 16:23:58 2019 +0100
Branches: master
https://developer.blender.org/rB605749ffaaa1dc004eb8595c2b5c3bad00f2bb34
Modifiers Evaluation: generate loop normals when requested.
This also fixes T62228.
However, datatransfer code is still doing bad things with its source,
still working on proper changes here.
===================================================================
M source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index a3f89d65c5a..1fe72ce95a7 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1176,7 +1176,8 @@ static void mesh_calc_modifiers(
/* Generic preview only in object mode! */
const bool do_mod_mcol = (ob->mode == OB_MODE_OBJECT);
- const bool do_loop_normals = (((Mesh *)ob->data)->flag & ME_AUTOSMOOTH) != 0;
+ const bool do_loop_normals = ((((Mesh *)ob->data)->flag & ME_AUTOSMOOTH) != 0 ||
+ (dataMask->lmask & CD_MASK_NORMAL) != 0);
VirtualModifierData virtualModifierData;
@@ -1705,7 +1706,8 @@ static void editbmesh_calc_modifiers(
const ModifierEvalContext mectx_orco = {depsgraph, ob, MOD_APPLY_ORCO};
const ModifierEvalContext mectx_cache = {depsgraph, ob, MOD_APPLY_USECACHE};
- const bool do_loop_normals = (((Mesh *)(ob->data))->flag & ME_AUTOSMOOTH) != 0;
+ const bool do_loop_normals = ((((Mesh *)(ob->data))->flag & ME_AUTOSMOOTH) != 0 ||
+ (dataMask->lmask & CD_MASK_NORMAL) != 0);
modifiers_clearErrors(ob);
More information about the Bf-blender-cvs
mailing list