Commit: 347e1f3acf2564327aeb53ffede8c7031780f856 Author: Antonio Vazquez Date: Thu Apr 29 15:53:26 2021 +0200 Branches: temp-gpencil-bezier-stroke-type https://developer.blender.org/rB347e1f3acf2564327aeb53ffede8c7031780f856
Merge branch 'master' into temp-gpencil-bezier-stroke-type Conflicts: source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c =================================================================== =================================================================== diff --cc source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c index 62eb00beb0e,a9d4d5091ec..38587d46f96 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c @@@ -125,8 -156,18 +175,19 @@@ static void deformPolyline(GpencilModif if (weight < 0.0f) { continue; } + /* Apply randomness matrix. */ + mul_m4_v3(mat_rnd, &pt->x); + + /* Calculate matrix. */ + mul_v3_v3fl(loc, mmd->loc, weight); + mul_v3_v3fl(rot, mmd->rot, weight); + mul_v3_v3fl(scale, mmd->scale, weight); + add_v3_fl(scale, 1.0); + loc_eul_size_to_mat4(mat, loc, rot, scale); + + /* Apply scale to thickness. */ - float unit_scale = (scale[0] + scale[1] + scale[2]) / 3.0f; + float mat[4][4]; + float unit_scale = prepare_matrix(mmd, weight, mat); pt->pressure *= unit_scale; mul_m4_v3(mat, &pt->x); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs