[Bf-blender-cvs] [61d847f] object_nodes: Displacement modifier is always expected to affect mesh normals.
Lukas Tönne
noreply at git.blender.org
Wed Dec 9 16:29:29 CET 2015
Commit: 61d847f10132d06c829cdff36eca946e7eeeedd2
Author: Lukas Tönne
Date: Wed Dec 9 16:27:41 2015 +0100
Branches: object_nodes
https://developer.blender.org/rB61d847f10132d06c829cdff36eca946e7eeeedd2
Displacement modifier is always expected to affect mesh normals.
===================================================================
M source/blender/blenvm/bvm/bvm_eval_mesh.h
===================================================================
diff --git a/source/blender/blenvm/bvm/bvm_eval_mesh.h b/source/blender/blenvm/bvm/bvm_eval_mesh.h
index 099a448..7bf9f83 100644
--- a/source/blender/blenvm/bvm/bvm_eval_mesh.h
+++ b/source/blender/blenvm/bvm/bvm_eval_mesh.h
@@ -278,8 +278,6 @@ static DerivedMesh *do_displace(const EvalGlobals *globals, const EvalKernelData
DerivedMesh *dm, int fn_vector, StackIndex offset_vector,
StackIndex offset_elem_index, StackIndex offset_elem_loc)
{
- const bool use_recalc_normals = (dm->dirty & DM_DIRTY_NORMALS);
-
DerivedMesh *result = CDDM_copy(dm);
MVert *orig_mv, *orig_mverts = dm->getVertArray(dm);
MVert *mv, *mverts = result->getVertArray(result);
@@ -295,9 +293,7 @@ static DerivedMesh *do_displace(const EvalGlobals *globals, const EvalKernelData
add_v3_v3v3(mv->co, orig_mv->co, dco.data());
}
- if (use_recalc_normals) {
- result->dirty = (DMDirtyFlag)(result->dirty | (int)DM_DIRTY_NORMALS);
- }
+ result->dirty = (DMDirtyFlag)(result->dirty | (int)DM_DIRTY_NORMALS);
return result;
}
More information about the Bf-blender-cvs
mailing list