[Bf-blender-cvs] [76e4ffdb90f] soc-2021-uv-editor-improvements: Cleanup: remove *.rej from cb67bfdba2e22d0ee967e50afe0912ac80d73e9b

[Campbell Barton]

Commit: 76e4ffdb90f0b1cc4d66372ea8c03234135747cb
Author: Campbell Barton
Date:   Wed Aug 4 21:09:21 2021 +1000
Branches: soc-2021-uv-editor-improvements
https://developer.blender.org/rB76e4ffdb90f0b1cc4d66372ea8c03234135747cb

Cleanup: remove *.rej from cb67bfdba2e22d0ee967e50afe0912ac80d73e9b

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

D	source/blender/makesdna/DNA_view3d_types.h.rej

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

diff --git a/source/blender/makesdna/DNA_view3d_types.h.rej b/source/blender/makesdna/DNA_view3d_types.h.rej
deleted file mode 100644
index a62f1c4b7d3..00000000000
--- a/source/blender/makesdna/DNA_view3d_types.h.rej
+++ /dev/null
@@ -1,9 +0,0 @@
-diff a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h	(rejected hunks)
-@@ -550,6 +553,7 @@
-   /* V3D_OVERLAY_EDIT_CU_HANDLES = (1 << 20),  */
- 
-   V3D_OVERLAY_EDIT_CU_NORMALS = (1 << 21),
-+  V3D_OVERLAY_EDIT_CONSTANT_SCREEN_SIZE_NORMALS = (1 << 22),
- };
- 
- /** #View3DOverlay.paint_flag */