Commit: c1df2745fda492ce46accbcfca55010f9f4bb238
Author: Campbell Barton
Date: Tue Apr 16 17:01:30 2019 +0200
Branches: temp-clang-format
https://developer.blender.org/rBc1df2745fda492ce46accbcfca55010f9f4bb238
Merge branch 'master' into temp-clang-format
===================================================================
===================================================================
diff --cc source/blender/bmesh/intern/bmesh_opdefines.c
index 348ca8d8500,4ca8e02e94d..389362e843b
--- a/source/blender/bmesh/intern/bmesh_opdefines.c
+++ b/source/blender/bmesh/intern/bmesh_opdefines.c
@@@ -2069,8 -2069,8 +2069,8 @@@ static BMOpDefine bmo_symmetrize_def =
BMO_OPTYPE_FLAG_SELECT_FLUSH |
BMO_OPTYPE_FLAG_SELECT_VALIDATE),
};
--
- /* clang-format off */
++;
+ /* clang-format on */
const BMOpDefine *bmo_opdefines[] = {
&bmo_automerge_def,
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
