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:
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_gpencil_modifier_types.h7
-rw-r--r--source/blender/makesdna/DNA_lineart_types.h9
2 files changed, 13 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_gpencil_modifier_types.h b/source/blender/makesdna/DNA_gpencil_modifier_types.h
index 3977ad326da..c0768c9a077 100644
--- a/source/blender/makesdna/DNA_gpencil_modifier_types.h
+++ b/source/blender/makesdna/DNA_gpencil_modifier_types.h
@@ -874,8 +874,9 @@ typedef enum eLineartGpencilModifierSource {
} eLineartGpencilModifierSource;
typedef enum eLineArtGPencilModifierFlags {
- LRT_GPENCIL_INVERT_SOURCE_VGROUP = (1 << 0),
- LRT_GPENCIL_MATCH_OUTPUT_VGROUP = (1 << 1),
+ /* These two moved to eLineartMainFlags to keep consistent with flag variable purpose. */
+ /* LRT_GPENCIL_INVERT_SOURCE_VGROUP = (1 << 0), */
+ /* LRT_GPENCIL_MATCH_OUTPUT_VGROUP = (1 << 1), */
LRT_GPENCIL_BINARY_WEIGHTS = (1 << 2) /* Deprecated, this is removed for lack of use case. */,
LRT_GPENCIL_IS_BAKED = (1 << 3),
LRT_GPENCIL_USE_CACHE = (1 << 4),
@@ -925,7 +926,7 @@ typedef struct LineartGpencilModifierData {
/** `0..PI` angle, for splitting strokes at sharp points. */
float angle_splitting_threshold;
- /* CPU mode */
+ /* Doubles as geometry threshold when geometry space chaining is enabled */
float chaining_image_threshold;
/* Ported from SceneLineArt flags. */
diff --git a/source/blender/makesdna/DNA_lineart_types.h b/source/blender/makesdna/DNA_lineart_types.h
index 860a6579bf7..bbb3bd29197 100644
--- a/source/blender/makesdna/DNA_lineart_types.h
+++ b/source/blender/makesdna/DNA_lineart_types.h
@@ -46,6 +46,15 @@ typedef enum eLineartMainFlags {
LRT_ALLOW_OVERLAPPING_EDGES = (1 << 3),
LRT_ALLOW_CLIPPING_BOUNDARIES = (1 << 4),
LRT_REMOVE_DOUBLES = (1 << 5),
+ LRT_FLOATING_AS_CONTOUR = (1 << 6),
+ LRT_GPENCIL_INVERT_SOURCE_VGROUP = (1 << 7),
+ LRT_GPENCIL_MATCH_OUTPUT_VGROUP = (1 << 8),
+ LRT_FILTER_FACE_MARK = (1 << 9),
+ LRT_FILTER_FACE_MARK_INVERT = (1 << 10),
+ LRT_FILTER_FACE_MARK_BOUNDARIES = (1 << 11),
+ LRT_CHAIN_FLOATING_EDGES = (1 << 11),
+ LRT_CHAIN_GEOMETRY_SPACE = (1 << 12),
+ LRT_ALLOW_OVERLAP_EDGE_TYPES = (1 << 13),
} eLineartMainFlags;
typedef enum eLineartEdgeFlag {