diff options
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r-- | source/blender/modifiers/intern/MOD_meshcache_util.h | 53 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_util.h | 6 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_weightvg_util.h | 22 |
3 files changed, 37 insertions, 44 deletions
diff --git a/source/blender/modifiers/intern/MOD_meshcache_util.h b/source/blender/modifiers/intern/MOD_meshcache_util.h index 74131099e3c..b1a8a3ffc19 100644 --- a/source/blender/modifiers/intern/MOD_meshcache_util.h +++ b/source/blender/modifiers/intern/MOD_meshcache_util.h @@ -23,52 +23,45 @@ /* MOD_meshcache_mdd.c */ bool MOD_meshcache_read_mdd_index(FILE *fp, float (*vertexCos)[3], - const int vertex_tot, - const int index, - const float factor, + int vertex_tot, + int index, + float factor, const char **err_str); bool MOD_meshcache_read_mdd_frame(FILE *fp, float (*vertexCos)[3], - const int verts_tot, - const char interp, - const float frame, + int verts_tot, + char interp, + float frame, const char **err_str); bool MOD_meshcache_read_mdd_times(const char *filepath, float (*vertexCos)[3], - const int verts_tot, - const char interp, - const float time, - const float fps, - const char time_mode, + int verts_tot, + char interp, + float time, + float fps, + char time_mode, const char **err_str); /* MOD_meshcache_pc2.c */ -bool MOD_meshcache_read_pc2_index(FILE *fp, - float (*vertexCos)[3], - const int verts_tot, - const int index, - const float factor, - const char **err_str); +bool MOD_meshcache_read_pc2_index( + FILE *fp, float (*vertexCos)[3], int verts_tot, int index, float factor, const char **err_str); bool MOD_meshcache_read_pc2_frame(FILE *fp, float (*vertexCos)[3], - const int verts_tot, - const char interp, - const float frame, + int verts_tot, + char interp, + float frame, const char **err_str); bool MOD_meshcache_read_pc2_times(const char *filepath, float (*vertexCos)[3], - const int verts_tot, - const char interp, - const float time, - const float fps, - const char time_mode, + int verts_tot, + char interp, + float time, + float fps, + char time_mode, const char **err_str); /* MOD_meshcache_util.c */ -void MOD_meshcache_calc_range(const float frame, - const char interp, - const int frame_tot, - int r_index_range[2], - float *r_factor); +void MOD_meshcache_calc_range( + float frame, char interp, int frame_tot, int r_index_range[2], float *r_factor); #define FRAME_SNAP_EPS 0.0001f diff --git a/source/blender/modifiers/intern/MOD_util.h b/source/blender/modifiers/intern/MOD_util.h index a6fc2749e71..de02b55440a 100644 --- a/source/blender/modifiers/intern/MOD_util.h +++ b/source/blender/modifiers/intern/MOD_util.h @@ -51,9 +51,9 @@ struct Mesh *MOD_deform_mesh_eval_get(struct Object *ob, struct BMEditMesh *em, struct Mesh *mesh, const float (*vertexCos)[3], - const int num_verts, - const bool use_normals, - const bool use_orco); + int num_verts, + bool use_normals, + bool use_orco); void MOD_get_vgroup(struct Object *ob, struct Mesh *mesh, diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.h b/source/blender/modifiers/intern/MOD_weightvg_util.h index 00aecd7342c..3bcbe3ed68b 100644 --- a/source/blender/modifiers/intern/MOD_weightvg_util.h +++ b/source/blender/modifiers/intern/MOD_weightvg_util.h @@ -64,7 +64,7 @@ struct uiLayout; void weightvg_do_map(int num, float *new_w, short falloff_type, - const bool do_invert, + bool do_invert, struct CurveMapping *cmap, struct RNG *rng); @@ -77,22 +77,22 @@ void weightvg_do_map(int num, * Else, weird results might appear. */ void weightvg_do_mask(const ModifierEvalContext *ctx, - const int num, + int num, const int *indices, float *org_w, const float *new_w, Object *ob, struct Mesh *mesh, - const float fact, + float fact, const char defgrp_name[MAX_VGROUP_NAME], struct Scene *scene, Tex *texture, - const int tex_use_channel, - const int tex_mapping, + int tex_use_channel, + int tex_mapping, Object *tex_map_object, const char *text_map_bone, const char *tex_uvlayer_name, - const bool invert_vgroup_mask); + bool invert_vgroup_mask); /** * Applies weights to given vgroup (defgroup), and optionally add/remove vertices from the group. @@ -107,11 +107,11 @@ void weightvg_update_vg(struct MDeformVert *dvert, int num, const int *indices, const float *weights, - const bool do_add, - const float add_thresh, - const bool do_rem, - const float rem_thresh, - const bool do_normalize); + bool do_add, + float add_thresh, + bool do_rem, + float rem_thresh, + bool do_normalize); /** * Common vertex weight mask interface elements for the modifier panels. |