Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-08-04 14:09:21 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-08-04 14:09:21 +0300
commitd2130c53276a985ab82b310c4a0c87b824116729 (patch)
tree3d29a09016871b481cd826ce587dc9707620b868 /source
parentadd719e31aa7d5668fd33cb1a1e02417a334be97 (diff)
Cleanup: remove *.rej from cb67bfdba2e22d0ee967e50afe0912ac80d73e9b
Diffstat (limited to 'source')
-rw-r--r--source/blender/makesdna/DNA_view3d_types.h.rej9
1 files changed, 0 insertions, 9 deletions
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 */