griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GP: Use weight in noise modifier for all types

Browse Source 
The weight was used only for position.
This commit is contained in:
Antonioya
2019-01-15 20:24:07 +01:00
parent b1fa2a8fbb
commit d844271aef
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
View File

@@ -219,10 +219,10 @@ static void deformStroke(
/* apply randomness to thickness */
if (mmd->flag & GP_NOISE_MOD_THICKNESS) {
if (vdir > 0.5f) {
pt1->pressure -= pt1->pressure * vran * mmd->factor;
pt1->pressure -= pt1->pressure * vran * mmd->factor * weight;
}
else {
pt1->pressure += pt1->pressure * vran * mmd->factor;
pt1->pressure += pt1->pressure * vran * mmd->factor * weight;
}
CLAMP_MIN(pt1->pressure, GPENCIL_STRENGTH_MIN);
}
@@ -230,20 +230,20 @@ static void deformStroke(
/* apply randomness to color strength */
if (mmd->flag & GP_NOISE_MOD_STRENGTH) {
if (vdir > 0.5f) {
pt1->strength -= pt1->strength * vran * mmd->factor;
pt1->strength -= pt1->strength * vran * mmd->factor * weight;
}
else {
pt1->strength += pt1->strength * vran * mmd->factor;
pt1->strength += pt1->strength * vran * mmd->factor * weight;
}
CLAMP_MIN(pt1->strength, GPENCIL_STRENGTH_MIN);
}
/* apply randomness to uv rotation */
if (mmd->flag & GP_NOISE_MOD_UV) {
if (vdir > 0.5f) {
pt1->uv_rot -= pt1->uv_rot * vran * mmd->factor;
pt1->uv_rot -= pt1->uv_rot * vran * mmd->factor * weight;
}
else {
pt1->uv_rot += pt1->uv_rot * vran * mmd->factor;
pt1->uv_rot += pt1->uv_rot * vran * mmd->factor * weight;
}
CLAMP(pt1->uv_rot, -M_PI_2, M_PI_2);
}