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
diff options
context:
space:
mode:
authorAaron Carlisle <Blendify>2021-07-27 01:52:48 +0300
committerAaron Carlisle <carlisle.b3d@gmail.com>2021-07-27 01:53:30 +0300
commit6ee14c966d05362228511756c4906e043b87e346 (patch)
treefc53c724fccc6bda9e6bb51f6db751e1bd692486 /source/blender/makesdna
parent05315af81dec2dd503c73f92680d2d6d72cd2b28 (diff)
Anotations: Fix a several issues with stroke placement
Previously, this option was not exposed in the UI, only for the clip editor. There were also multiple rna properties that did the same thing for each of the 2D editors. There was also an issue where the property enum items were the same as the 3d view which didnt make much sense. Reviewed By: antoniov Differential Revision: https://developer.blender.org/D12027
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_scene_defaults.h2
-rw-r--r--source/blender/makesdna/DNA_scene_types.h5
2 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_scene_defaults.h b/source/blender/makesdna/DNA_scene_defaults.h
index 1a2a8892e64..61707964191 100644
--- a/source/blender/makesdna/DNA_scene_defaults.h
+++ b/source/blender/makesdna/DNA_scene_defaults.h
@@ -374,8 +374,6 @@
/* GP Stroke Placement */ \
.gpencil_v3d_align = GP_PROJECT_VIEWSPACE, \
.gpencil_v2d_align = GP_PROJECT_VIEWSPACE, \
- .gpencil_seq_align = GP_PROJECT_VIEWSPACE, \
- .gpencil_ima_align = GP_PROJECT_VIEWSPACE, \
}
/* clang-format off */
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 31352b2c8f4..000db5bf5b1 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1409,10 +1409,7 @@ typedef struct ToolSettings {
char gpencil_v3d_align;
/** General 2D Editor. */
char gpencil_v2d_align;
- /** Sequencer Preview. */
- char gpencil_seq_align;
- /** Image Editor. */
- char gpencil_ima_align;
+ char _pad0[2];
/* Annotations */
/** Stroke placement settings - 3D View. */