diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-12 09:21:07 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-12 09:22:03 +0300 |
| commit | 4dc91ebf81438c473bbd8f9a1655179335c6d42f (patch) | |
| tree | bf254664e6ffcec5e2a4f12417e5a6f0779c4f7e /source/blender/modifiers/intern/MOD_util.h | |
| parent | 1813f00b94982727bf545cd4c49ec2d2fee86f7a (diff) | |
| parent | c84b8d480196a8c1d18a46c3e704dc9ce88f5c8b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_util.h')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_util.h | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/source/blender/modifiers/intern/MOD_util.h b/source/blender/modifiers/intern/MOD_util.h index 545ae3264db..4ca13e164fb 100644 --- a/source/blender/modifiers/intern/MOD_util.h +++ b/source/blender/modifiers/intern/MOD_util.h @@ -42,8 +42,9 @@ struct Scene; struct Tex; void modifier_init_texture(const struct Scene *scene, struct Tex *texture); -void get_texture_coords(struct MappingInfoModifierData *dmd, struct Object *ob, struct DerivedMesh *dm, - float (*co)[3], float (*texco)[3], int numVerts); +void get_texture_coords( + struct MappingInfoModifierData *dmd, struct Object *ob, struct DerivedMesh *dm, + float (*co)[3], float (*texco)[3], int numVerts); void get_texture_coords_mesh( struct MappingInfoModifierData *dmd, struct Object *ob, @@ -51,17 +52,22 @@ void get_texture_coords_mesh( float (*cos)[3], float (*r_texco)[3]); void modifier_vgroup_cache(struct ModifierData *md, float (*vertexCos)[3]); -struct DerivedMesh *get_cddm(struct Object *ob, struct BMEditMesh *em, struct DerivedMesh *dm, - float (*vertexCos)[3], bool use_normals); -struct DerivedMesh *get_dm(struct Object *ob, struct BMEditMesh *em, struct DerivedMesh *dm, - float (*vertexCos)[3], bool use_normals, bool use_orco); -struct Mesh *get_mesh(struct Object *ob, struct BMEditMesh *em, struct Mesh *mesh, - float (*vertexCos)[3], bool use_normals, bool use_orco); +struct DerivedMesh *get_cddm( + struct Object *ob, struct BMEditMesh *em, struct DerivedMesh *dm, + float (*vertexCos)[3], bool use_normals); +struct DerivedMesh *get_dm( + struct Object *ob, struct BMEditMesh *em, struct DerivedMesh *dm, + float (*vertexCos)[3], bool use_normals, bool use_orco); +struct Mesh *get_mesh( + struct Object *ob, struct BMEditMesh *em, struct Mesh *mesh, + float (*vertexCos)[3], bool use_normals, bool use_orco); struct DerivedMesh *get_dm_for_modifier(struct Object *ob, ModifierApplyFlag flag); -void modifier_get_vgroup(struct Object *ob, struct DerivedMesh *dm, - const char *name, struct MDeformVert **dvert, int *defgrp_index); -void modifier_get_vgroup_mesh(struct Object *ob, struct Mesh *mesh, - const char *name, struct MDeformVert **dvert, int *defgrp_index); +void modifier_get_vgroup( + struct Object *ob, struct DerivedMesh *dm, + const char *name, struct MDeformVert **dvert, int *defgrp_index); +void modifier_get_vgroup_mesh( + struct Object *ob, struct Mesh *mesh, + const char *name, struct MDeformVert **dvert, int *defgrp_index); #endif /* __MOD_UTIL_H__ */ |