diff options
| author | YimingWu <xp8110@outlook.com> | 2020-11-07 10:07:01 +0300 |
|---|---|---|
| committer | YimingWu <xp8110@outlook.com> | 2020-11-07 10:07:01 +0300 |
| commit | 67852caf0b3bb7630c1c713258d721e5253e1032 (patch) | |
| tree | 98e6fa7e0122c85c4ee92922f30b9fcf3284cf16 /source/blender/gpencil_modifiers | |
| parent | 22875e3ab0838ff0b84a21ee743550b8537877aa (diff) | |
| parent | d2c102060d4489aa1fd68f6c33df4ba9c4add78b (diff) | |
Merge remote-tracking branch 'origin/master' into lanpr-under-gp
# Conflicts:
# CMakeLists.txt
# source/blender/blenloader/intern/readfile.c
# source/blender/blenloader/intern/writefile.c
Diffstat (limited to 'source/blender/gpencil_modifiers')
| -rw-r--r-- | source/blender/gpencil_modifiers/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/gpencil_modifiers/CMakeLists.txt b/source/blender/gpencil_modifiers/CMakeLists.txt index b950b55f7c5..f9cc7737f19 100644 --- a/source/blender/gpencil_modifiers/CMakeLists.txt +++ b/source/blender/gpencil_modifiers/CMakeLists.txt @@ -31,7 +31,7 @@ set(INC ../editors/include ../makesdna ../makesrna - ../render/extern/include + ../render ../windowmanager ../../../intern/eigen ../../../intern/guardedalloc diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c index 35bf870b259..6a630cbf978 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c @@ -97,7 +97,7 @@ static void deformStroke(GpencilModifierData *md, mmd->flag & GP_TEX_INVERT_MATERIAL)) { return; } - if ((mmd->mode == FILL) || (mmd->mode == STROKE_AND_FILL)) { + if (ELEM(mmd->mode, FILL, STROKE_AND_FILL)) { gps->uv_rotation += mmd->fill_rotation; gps->uv_translation[0] += mmd->fill_offset[0]; gps->uv_translation[1] += mmd->fill_offset[1]; @@ -105,7 +105,7 @@ static void deformStroke(GpencilModifierData *md, BKE_gpencil_stroke_geometry_update(gps); } - if ((mmd->mode == STROKE) || (mmd->mode == STROKE_AND_FILL)) { + if (ELEM(mmd->mode, STROKE, STROKE_AND_FILL)) { float totlen = 1.0f; if (mmd->fit_method == GP_TEX_FIT_STROKE) { totlen = 0.0f; |