[Bf-blender-cvs] [e2e3a61310f] master: Cleanup: avoid adjacent C-style comments

Campbell Barton noreply at git.blender.org
Tue Apr 16 17:55:28 CEST 2019


Commit: e2e3a61310f635b13c1c8a903e917161f4142e8c
Author: Campbell Barton
Date:   Tue Apr 16 17:55:11 2019 +0200
Branches: master
https://developer.blender.org/rBe2e3a61310f635b13c1c8a903e917161f4142e8c

Cleanup: avoid adjacent C-style comments

Causes clang-format to give different results on a second run.

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

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

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

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 6d9be9fb639..02afdfe035b 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1721,7 +1721,9 @@ static void editbmesh_calc_modifiers(
 
 			/* set the DerivedMesh to only copy needed data */
 			CustomData_MeshMasks_update(&mask, &append_mask);
-			mask = md_datamask->mask; /* CD_MASK_ORCO may have been cleared above */ /* XXX WHAT? ovewrites mask ??? */
+			/* XXX WHAT? ovewrites mask ??? */
+			/* CD_MASK_ORCO may have been cleared above */
+			mask = md_datamask->mask;
 			mask.vmask |= CD_MASK_ORIGINDEX;
 			mask.emask |= CD_MASK_ORIGINDEX;
 			mask.pmask |= CD_MASK_ORIGINDEX;



More information about the Bf-blender-cvs mailing list