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:
authorYimingWu <xp8110@outlook.com>2021-09-19 08:18:27 +0300
committerYimingWu <xp8110@outlook.com>2021-09-19 08:19:32 +0300
commit69697fcca96178d53b57b14b5e4a39685a8378a1 (patch)
treee9b967deb25f77eef348786f5cd22524eef0ec20 /source/blender/makesdna
parent25e548c96b3d8c1698fd4385b4dc395665b5a7f6 (diff)
Revert "GPencil: Curvature support for length modifier."
Reason for revert: accidental push of a intermediate change locally. This reverts commit 25e548c96b3d8c1698fd4385b4dc395665b5a7f6.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_gpencil_modifier_defaults.h6
-rw-r--r--source/blender/makesdna/DNA_gpencil_modifier_types.h7
2 files changed, 2 insertions, 11 deletions
diff --git a/source/blender/makesdna/DNA_gpencil_modifier_defaults.h b/source/blender/makesdna/DNA_gpencil_modifier_defaults.h
index 9d7dc50bcbf..450527c7443 100644
--- a/source/blender/makesdna/DNA_gpencil_modifier_defaults.h
+++ b/source/blender/makesdna/DNA_gpencil_modifier_defaults.h
@@ -314,13 +314,9 @@
{ \
.start_fac = 0.1f,\
.end_fac = 0.1f,\
- .overshoot_fac = 0.1f,\
+ .overshoot_fac = 0.01f,\
.pass_index = 0,\
.material = NULL,\
- .flag = GP_LENGTH_USE_CURVATURE,\
- .point_density = 30.0f,\
- .edge_point_tradeoff = 1.0f,\
- .max_angle = DEG2RAD(170.0f),\
}
#define _DNA_DEFAULT_DashGpencilModifierData \
diff --git a/source/blender/makesdna/DNA_gpencil_modifier_types.h b/source/blender/makesdna/DNA_gpencil_modifier_types.h
index cd34717eb4b..d3429329ef6 100644
--- a/source/blender/makesdna/DNA_gpencil_modifier_types.h
+++ b/source/blender/makesdna/DNA_gpencil_modifier_types.h
@@ -493,10 +493,7 @@ typedef struct LengthGpencilModifierData {
float overshoot_fac;
/** Modifier mode. */
int mode;
- /* Curvature paramters. */
- float point_density;
- float edge_point_tradeoff;
- float max_angle;
+ char _pad[4];
} LengthGpencilModifierData;
typedef enum eLengthGpencil_Flag {
@@ -504,8 +501,6 @@ typedef enum eLengthGpencil_Flag {
GP_LENGTH_INVERT_PASS = (1 << 1),
GP_LENGTH_INVERT_LAYERPASS = (1 << 2),
GP_LENGTH_INVERT_MATERIAL = (1 << 3),
- GP_LENGTH_USE_CURVATURE = (1 << 4),
- GP_LENGTH_INVERT_CURVATURE = (1 << 5),
} eLengthGpencil_Flag;
typedef enum eLengthGpencil_Type {