diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-09-02 09:45:00 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-02 09:49:45 +0300 |
commit | 6abb37babc6aad9d7f262b1516b7a0e2972cb8e1 (patch) | |
tree | 1e2593349ca7903159cd5dab891e8af38b4b1676 /source/blender/blenkernel | |
parent | 83199b643047f8576f27f2ffcffe623c0bfc5656 (diff) |
Cleanup: style
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_lattice.h | 28 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/gpencil_modifier.c | 8 |
2 files changed, 20 insertions, 16 deletions
diff --git a/source/blender/blenkernel/BKE_lattice.h b/source/blender/blenkernel/BKE_lattice.h index 2ca6a35eec5..2e093ba11a2 100644 --- a/source/blender/blenkernel/BKE_lattice.h +++ b/source/blender/blenkernel/BKE_lattice.h @@ -62,20 +62,24 @@ void end_latt_deform(struct LatticeDeformData *lattice_deform_data); bool object_deform_mball(struct Object *ob, struct ListBase *dispbase); void outside_lattice(struct Lattice *lt); -void curve_deform_verts(struct Object *cuOb, struct Object *target, +void curve_deform_verts( + struct Object *cuOb, struct Object *target, struct Mesh *mesh, float (*vertexCos)[3], int numVerts, const char *vgroup, short defaxis); -void curve_deform_vector(struct Object *cuOb, struct Object *target, - float orco[3], float vec[3], float mat[3][3], int no_rot_axis); - -void lattice_deform_verts(struct Object *laOb, struct Object *target, - struct Mesh *mesh, float (*vertexCos)[3], - int numVerts, const char *vgroup, float influence); -void armature_deform_verts(struct Object *armOb, struct Object *target, - const struct Mesh *mesh, float (*vertexCos)[3], - float (*defMats)[3][3], int numVerts, int deformflag, - float (*prevCos)[3], const char *defgrp_name, - struct bGPDstroke *gps); +void curve_deform_vector( + struct Object *cuOb, struct Object *target, + float orco[3], float vec[3], float mat[3][3], int no_rot_axis); + +void lattice_deform_verts( + struct Object *laOb, struct Object *target, + struct Mesh *mesh, float (*vertexCos)[3], + int numVerts, const char *vgroup, float influence); +void armature_deform_verts( + struct Object *armOb, struct Object *target, + const struct Mesh *mesh, float (*vertexCos)[3], + float (*defMats)[3][3], int numVerts, int deformflag, + float (*prevCos)[3], const char *defgrp_name, + struct bGPDstroke *gps); float (*BKE_lattice_vertexcos_get(struct Object *ob, int *r_numVerts))[3]; void BKE_lattice_vertexcos_apply(struct Object *ob, float (*vertexCos)[3]); diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c index af82d8fa200..bff71f64871 100644 --- a/source/blender/blenkernel/intern/gpencil_modifier.c +++ b/source/blender/blenkernel/intern/gpencil_modifier.c @@ -423,10 +423,10 @@ void BKE_gpencil_stroke_modifiers(Depsgraph *depsgraph, Object *ob, bGPDlayer *g /* some modifiers could require a recalc of fill triangulation data */ if (gpd->flag & GP_DATA_STROKE_FORCE_RECALC) { if (ELEM(md->type, - eGpencilModifierType_Armature, - eGpencilModifierType_Hook, - eGpencilModifierType_Lattice, - eGpencilModifierType_Offset)) + eGpencilModifierType_Armature, + eGpencilModifierType_Hook, + eGpencilModifierType_Lattice, + eGpencilModifierType_Offset)) { gps->flag |= GP_STROKE_RECALC_CACHES; |