diff options
author | Sebastian Parborg <darkdefende@gmail.com> | 2020-09-04 21:59:13 +0300 |
---|---|---|
committer | Sebastian Parborg <darkdefende@gmail.com> | 2020-09-04 22:04:16 +0300 |
commit | 2115232a16d81d28dbdb8042ed8e9316858514c6 (patch) | |
tree | 1aeb7354a85b21b43a3ede7bf2980c172d4eec82 /source/blender/blenkernel | |
parent | e43d482cc93c64d55b1f58178db68551077e6560 (diff) |
Cleanup: Clang-Tidy readability-inconsistent-declaration-parameter-name fix
No functional changes
Diffstat (limited to 'source/blender/blenkernel')
57 files changed, 182 insertions, 173 deletions
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index 9752185bc40..42ce7e06c26 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -257,7 +257,7 @@ void DM_init(DerivedMesh *dm, DerivedMeshType type, int numVerts, int numEdges, - int numFaces, + int numTessFaces, int numLoops, int numPolys); @@ -275,7 +275,7 @@ void DM_from_template(DerivedMesh *dm, DerivedMeshType type, int numVerts, int numEdges, - int numFaces, + int numTessFaces, int numLoops, int numPolys); @@ -353,7 +353,7 @@ struct Mesh *editbmesh_get_eval_cage(struct Depsgraph *depsgraph, const struct CustomData_MeshMasks *dataMask); struct Mesh *editbmesh_get_eval_cage_from_orig(struct Depsgraph *depsgraph, struct Scene *scene, - struct Object *object, + struct Object *obedit, const struct CustomData_MeshMasks *dataMask); struct Mesh *editbmesh_get_eval_cage_and_final(struct Depsgraph *depsgraph, struct Scene *scene, @@ -375,7 +375,7 @@ void makeDerivedMesh(struct Depsgraph *depsgraph, void DM_calc_loop_tangents(DerivedMesh *dm, bool calc_active_tangent, const char (*tangent_names)[MAX_NAME], - int tangent_names_count); + int tangent_names_len); /* debug only */ #ifndef NDEBUG diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h index 6d48397b1af..7c5d0011465 100644 --- a/source/blender/blenkernel/BKE_armature.h +++ b/source/blender/blenkernel/BKE_armature.h @@ -95,7 +95,7 @@ bool BKE_armature_bone_flag_test_recursive(const struct Bone *bone, int flag); void BKE_armature_refresh_layer_used(struct Depsgraph *depsgraph, struct bArmature *arm); float distfactor_to_bone( - const float vec[3], const float b1[3], const float b2[3], float r1, float r2, float rdist); + const float vec[3], const float b1[3], const float b2[3], float rad1, float rad2, float rdist); void BKE_armature_where_is(struct bArmature *arm); void BKE_armature_where_is_bone(struct Bone *bone, @@ -153,8 +153,8 @@ void BKE_armature_mat_pose_to_bone_ex(struct Depsgraph *depsgraph, void BKE_pchan_mat3_to_rot(struct bPoseChannel *pchan, const float mat[3][3], bool use_compat); void BKE_pchan_rot_to_mat3(const struct bPoseChannel *pchan, float r_mat[3][3]); -void BKE_pchan_apply_mat4(struct bPoseChannel *pchan, const float mat[4][4], bool use_comat); -void BKE_pchan_to_mat4(const struct bPoseChannel *pchan, float r_mat[4][4]); +void BKE_pchan_apply_mat4(struct bPoseChannel *pchan, const float mat[4][4], bool use_compat); +void BKE_pchan_to_mat4(const struct bPoseChannel *pchan, float r_chanmat[4][4]); void BKE_pchan_calc_mat(struct bPoseChannel *pchan); /* Simple helper, computes the offset bone matrix. */ diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index abc0ce1f092..813472715fa 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -34,12 +34,12 @@ void BKE_blender_free(void); void BKE_blender_globals_init(void); void BKE_blender_globals_clear(void); -void BKE_blender_userdef_data_swap(struct UserDef *userdef_dst, struct UserDef *userdef_src); +void BKE_blender_userdef_data_swap(struct UserDef *userdef_a, struct UserDef *userdef_b); void BKE_blender_userdef_data_set(struct UserDef *userdef); void BKE_blender_userdef_data_set_and_free(struct UserDef *userdef); -void BKE_blender_userdef_app_template_data_swap(struct UserDef *userdef_dst, - struct UserDef *userdef_src); +void BKE_blender_userdef_app_template_data_swap(struct UserDef *userdef_a, + struct UserDef *userdef_b); void BKE_blender_userdef_app_template_data_set(struct UserDef *userdef); void BKE_blender_userdef_app_template_data_set_and_free(struct UserDef *userdef); diff --git a/source/blender/blenkernel/BKE_bpath.h b/source/blender/blenkernel/BKE_bpath.h index 787dc4d1147..3ec5409ca7f 100644 --- a/source/blender/blenkernel/BKE_bpath.h +++ b/source/blender/blenkernel/BKE_bpath.h @@ -35,17 +35,20 @@ struct ReportList; * path has changed, and in that case, should write the result to pathOut. */ typedef bool (*BPathVisitor)(void *userdata, char *path_dst, const char *path_src); /* Executes 'visit' for each path associated with 'id'. */ -void BKE_bpath_traverse_id( - struct Main *bmain, struct ID *id, BPathVisitor visit_cb, const int flag, void *userdata); +void BKE_bpath_traverse_id(struct Main *bmain, + struct ID *id, + BPathVisitor visit_cb, + const int flag, + void *bpath_user_data); void BKE_bpath_traverse_id_list(struct Main *bmain, struct ListBase *lb, BPathVisitor visit_cb, const int flag, - void *userdata); + void *bpath_user_data); void BKE_bpath_traverse_main(struct Main *bmain, BPathVisitor visit_cb, const int flag, - void *userdata); + void *bpath_user_data); bool BKE_bpath_relocate_visitor(void *oldbasepath, char *path_dst, const char *path_src); /* Functions for temp backup/restore of paths, path count must NOT change */ diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h index af299c917eb..b14d24e205a 100644 --- a/source/blender/blenkernel/BKE_brush.h +++ b/source/blender/blenkernel/BKE_brush.h @@ -113,10 +113,12 @@ const float *BKE_brush_secondary_color_get(const struct Scene *scene, const stru void BKE_brush_color_set(struct Scene *scene, struct Brush *brush, const float color[3]); int BKE_brush_size_get(const struct Scene *scene, const struct Brush *brush); -void BKE_brush_size_set(struct Scene *scene, struct Brush *brush, int value); +void BKE_brush_size_set(struct Scene *scene, struct Brush *brush, int size); float BKE_brush_unprojected_radius_get(const struct Scene *scene, const struct Brush *brush); -void BKE_brush_unprojected_radius_set(struct Scene *scene, struct Brush *brush, float value); +void BKE_brush_unprojected_radius_set(struct Scene *scene, + struct Brush *brush, + float unprojected_radius); float BKE_brush_alpha_get(const struct Scene *scene, const struct Brush *brush); void BKE_brush_alpha_set(struct Scene *scene, struct Brush *brush, float alpha); diff --git a/source/blender/blenkernel/BKE_bvhutils.h b/source/blender/blenkernel/BKE_bvhutils.h index e973bee9e20..84a17136361 100644 --- a/source/blender/blenkernel/BKE_bvhutils.h +++ b/source/blender/blenkernel/BKE_bvhutils.h @@ -130,7 +130,7 @@ BVHTree *bvhtree_from_editmesh_verts_ex(BVHTreeFromEditMesh *data, BVHTree *bvhtree_from_mesh_verts_ex(struct BVHTreeFromMesh *data, const struct MVert *vert, - const int numVerts, + const int verts_num, const bool vert_allocated, const BLI_bitmap *mask, int verts_num_active, @@ -177,7 +177,7 @@ BVHTree *bvhtree_from_mesh_faces_ex(struct BVHTreeFromMesh *data, const int numFaces, const bool face_allocated, const BLI_bitmap *mask, - int numFaces_active, + int faces_num_active, float epsilon, int tree_type, int axis, diff --git a/source/blender/blenkernel/BKE_camera.h b/source/blender/blenkernel/BKE_camera.h index 533d5ae13cd..2ea03f30d88 100644 --- a/source/blender/blenkernel/BKE_camera.h +++ b/source/blender/blenkernel/BKE_camera.h @@ -90,7 +90,7 @@ typedef struct CameraParams { #define CAMERA_PARAM_ZOOM_INIT_PERSP 2.0f void BKE_camera_params_init(CameraParams *params); -void BKE_camera_params_from_object(CameraParams *params, const struct Object *camera); +void BKE_camera_params_from_object(CameraParams *params, const struct Object *cam_ob); void BKE_camera_params_from_view3d(CameraParams *params, struct Depsgraph *depsgraph, const struct View3D *v3d, diff --git a/source/blender/blenkernel/BKE_cdderivedmesh.h b/source/blender/blenkernel/BKE_cdderivedmesh.h index e997678001f..7695193d619 100644 --- a/source/blender/blenkernel/BKE_cdderivedmesh.h +++ b/source/blender/blenkernel/BKE_cdderivedmesh.h @@ -43,7 +43,7 @@ struct DerivedMesh *CDDM_from_mesh(struct Mesh *mesh); /* Copies the given DerivedMesh with verts, faces & edges stored as * custom element data. */ -struct DerivedMesh *CDDM_copy(struct DerivedMesh *dm); +struct DerivedMesh *CDDM_copy(struct DerivedMesh *source); #ifdef __cplusplus } diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h index 579adb61057..965bb7b737e 100644 --- a/source/blender/blenkernel/BKE_collision.h +++ b/source/blender/blenkernel/BKE_collision.h @@ -165,7 +165,7 @@ typedef struct ColliderCache { struct CollisionModifierData *collmd; } ColliderCache; -struct ListBase *BKE_collider_cache_create(struct Depsgraph *scene, +struct ListBase *BKE_collider_cache_create(struct Depsgraph *depsgraph, struct Object *self, struct Collection *collection); void BKE_collider_cache_free(struct ListBase **colliders); diff --git a/source/blender/blenkernel/BKE_constraint.h b/source/blender/blenkernel/BKE_constraint.h index 94349f4db22..ecb891760b7 100644 --- a/source/blender/blenkernel/BKE_constraint.h +++ b/source/blender/blenkernel/BKE_constraint.h @@ -205,7 +205,7 @@ void BKE_constraint_mat_convertspace(struct Object *ob, void BKE_constraint_target_matrix_get(struct Depsgraph *depsgraph, struct Scene *scene, struct bConstraint *con, - int n, + int index, short ownertype, void *ownerdata, float mat[4][4], diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h index eb26f1c3969..ef6c36a9730 100644 --- a/source/blender/blenkernel/BKE_context.h +++ b/source/blender/blenkernel/BKE_context.h @@ -215,7 +215,7 @@ void CTX_data_pointer_set(bContextDataResult *result, struct ID *id, StructRNA * void CTX_data_id_list_add(bContextDataResult *result, struct ID *id); void CTX_data_list_add(bContextDataResult *result, struct ID *id, StructRNA *type, void *data); -void CTX_data_dir_set(bContextDataResult *result, const char **member); +void CTX_data_dir_set(bContextDataResult *result, const char **dir); void CTX_data_type_set(struct bContextDataResult *result, short type); short CTX_data_type_get(struct bContextDataResult *result); @@ -262,7 +262,7 @@ enum eContextObjectMode CTX_data_mode_enum_ex(const struct Object *obedit, enum eContextObjectMode CTX_data_mode_enum(const bContext *C); void CTX_data_main_set(bContext *C, struct Main *bmain); -void CTX_data_scene_set(bContext *C, struct Scene *bmain); +void CTX_data_scene_set(bContext *C, struct Scene *scene); int CTX_data_selected_editable_objects(const bContext *C, ListBase *list); int CTX_data_selected_editable_bases(const bContext *C, ListBase *list); diff --git a/source/blender/blenkernel/BKE_curveprofile.h b/source/blender/blenkernel/BKE_curveprofile.h index 08d3da7123c..4c785566f9c 100644 --- a/source/blender/blenkernel/BKE_curveprofile.h +++ b/source/blender/blenkernel/BKE_curveprofile.h @@ -69,7 +69,7 @@ void BKE_curveprofile_reverse(struct CurveProfile *profile); void BKE_curveprofile_reset(struct CurveProfile *profile); void BKE_curveprofile_create_samples(struct CurveProfile *profile, - int segments_len, + int n_segments, bool sample_straight_edges, struct CurveProfilePoint *r_samples); @@ -87,7 +87,7 @@ void BKE_curveprofile_update(struct CurveProfile *profile, const int update_flag float BKE_curveprofile_total_length(const struct CurveProfile *profile); void BKE_curveprofile_create_samples_even_spacing(struct CurveProfile *profile, - int segments_len, + int n_segments, struct CurveProfilePoint *r_samples); /* Length portion is the fraction of the total path length where we want the location */ diff --git a/source/blender/blenkernel/BKE_deform.h b/source/blender/blenkernel/BKE_deform.h index a9f81676a7a..e007204fcd7 100644 --- a/source/blender/blenkernel/BKE_deform.h +++ b/source/blender/blenkernel/BKE_deform.h @@ -39,7 +39,7 @@ struct BlendWriter; struct BlendDataReader; struct bDeformGroup *BKE_object_defgroup_new(struct Object *ob, const char *name); -void BKE_defgroup_copy_list(struct ListBase *lb1, const struct ListBase *lb2); +void BKE_defgroup_copy_list(struct ListBase *outbase, const struct ListBase *inbase); struct bDeformGroup *BKE_defgroup_duplicate(const struct bDeformGroup *ingroup); struct bDeformGroup *BKE_object_defgroup_find_name(const struct Object *ob, const char *name); int *BKE_object_defgroup_flip_map(const struct Object *ob, diff --git a/source/blender/blenkernel/BKE_dynamicpaint.h b/source/blender/blenkernel/BKE_dynamicpaint.h index 99b58b2f40a..31f48be2c27 100644 --- a/source/blender/blenkernel/BKE_dynamicpaint.h +++ b/source/blender/blenkernel/BKE_dynamicpaint.h @@ -72,7 +72,7 @@ struct Mesh *dynamicPaint_Modifier_do(struct DynamicPaintModifierData *pmd, void dynamicPaint_Modifier_free(struct DynamicPaintModifierData *pmd); void dynamicPaint_Modifier_free_runtime(struct DynamicPaintRuntime *runtime); void dynamicPaint_Modifier_copy(const struct DynamicPaintModifierData *pmd, - struct DynamicPaintModifierData *tsmd, + struct DynamicPaintModifierData *tpmd, int flag); bool dynamicPaint_createType(struct DynamicPaintModifierData *pmd, int type, struct Scene *scene); diff --git a/source/blender/blenkernel/BKE_gpencil_geom.h b/source/blender/blenkernel/BKE_gpencil_geom.h index 0abd87d3d4e..3baa650c8f0 100644 --- a/source/blender/blenkernel/BKE_gpencil_geom.h +++ b/source/blender/blenkernel/BKE_gpencil_geom.h @@ -51,7 +51,7 @@ void BKE_gpencil_stroke_boundingbox_calc(struct bGPDstroke *gps); /* stroke geometry utilities */ void BKE_gpencil_stroke_normal(const struct bGPDstroke *gps, float r_normal[3]); -void BKE_gpencil_stroke_simplify_adaptive(struct bGPDstroke *gps, float factor); +void BKE_gpencil_stroke_simplify_adaptive(struct bGPDstroke *gps, float epsilon); void BKE_gpencil_stroke_simplify_fixed(struct bGPDstroke *gps); void BKE_gpencil_stroke_subdivide(struct bGPDstroke *gps, int level, int type); bool BKE_gpencil_stroke_trim(struct bGPDstroke *gps); diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h index a04f6438170..725f19b1ce2 100644 --- a/source/blender/blenkernel/BKE_image.h +++ b/source/blender/blenkernel/BKE_image.h @@ -98,7 +98,7 @@ int BKE_imbuf_write(struct ImBuf *ibuf, const char *name, const struct ImageForm int BKE_imbuf_write_as(struct ImBuf *ibuf, const char *name, struct ImageFormatData *imf, - const bool is_copy); + const bool save_copy); void BKE_image_path_from_imformat(char *string, const char *base, const char *relbase, @@ -238,7 +238,7 @@ void BKE_image_editors_update_frame(const struct Main *bmain, int cfra); /* dependency graph update for image user users */ bool BKE_image_user_id_has_animation(struct ID *id); -void BKE_image_user_id_eval_animation(struct Depsgraph *depsgrah, struct ID *id); +void BKE_image_user_id_eval_animation(struct Depsgraph *depsgraph, struct ID *id); /* sets index offset for multilayer files */ struct RenderPass *BKE_image_multilayer_index(struct RenderResult *rr, struct ImageUser *iuser); @@ -272,7 +272,7 @@ void BKE_image_free_all_textures(struct Main *bmain); void BKE_image_free_anim_ibufs(struct Image *ima, int except_frame); /* does all images with type MOVIE or SEQUENCE */ -void BKE_image_all_free_anim_ibufs(struct Main *bmain, int except_frame); +void BKE_image_all_free_anim_ibufs(struct Main *bmain, int cfra); void BKE_image_free_all_gputextures(struct Main *bmain); void BKE_image_free_anim_gputextures(struct Main *bmain); @@ -392,7 +392,7 @@ void BKE_image_free_unused_gpu_textures(void); struct RenderSlot *BKE_image_add_renderslot(struct Image *ima, const char *name); bool BKE_image_remove_renderslot(struct Image *ima, struct ImageUser *iuser, int slot); -struct RenderSlot *BKE_image_get_renderslot(struct Image *ima, int slot); +struct RenderSlot *BKE_image_get_renderslot(struct Image *ima, int index); bool BKE_image_clear_renderslot(struct Image *ima, struct ImageUser *iuser, int slot); #ifdef __cplusplus diff --git a/source/blender/blenkernel/BKE_kelvinlet.h b/source/blender/blenkernel/BKE_kelvinlet.h index b3966d3ca4a..f3833ea381a 100644 --- a/source/blender/blenkernel/BKE_kelvinlet.h +++ b/source/blender/blenkernel/BKE_kelvinlet.h @@ -51,27 +51,27 @@ void BKE_kelvinlet_init_params( /* Regularized Kelvinlets */ /* All these functions output the displacement that should be applied to each element. */ /* The initial coordinates of that element should not be modified during the transformation */ -void BKE_kelvinlet_grab(float r_elem_disp[3], +void BKE_kelvinlet_grab(float radius_elem_disp[3], const KelvinletParams *params, const float elem_orig_co[3], const float brush_location[3], const float brush_delta[3]); -void BKE_kelvinlet_grab_biscale(float r_elem_disp[3], +void BKE_kelvinlet_grab_biscale(float radius_elem_disp[3], const KelvinletParams *params, const float elem_orig_co[3], const float brush_location[3], const float brush_delta[3]); -void BKE_kelvinlet_grab_triscale(float r_elem_disp[3], +void BKE_kelvinlet_grab_triscale(float radius_elem_disp[3], const KelvinletParams *params, const float elem_orig_co[3], const float brush_location[3], const float brush_delta[3]); -void BKE_kelvinlet_scale(float r_elem_disp[3], +void BKE_kelvinlet_scale(float radius_elem_disp[3], const KelvinletParams *params, const float elem_orig_co[3], const float brush_location[3], const float surface_normal[3]); -void BKE_kelvinlet_twist(float r_elem_disp[3], +void BKE_kelvinlet_twist(float radius_elem_disp[3], const KelvinletParams *params, const float elem_orig_co[3], const float brush_location[3], diff --git a/source/blender/blenkernel/BKE_key.h b/source/blender/blenkernel/BKE_key.h index e67df194431..347f16d3e0d 100644 --- a/source/blender/blenkernel/BKE_key.h +++ b/source/blender/blenkernel/BKE_key.h @@ -36,7 +36,7 @@ struct Object; extern "C" { #endif -void BKE_key_free(struct Key *sc); +void BKE_key_free(struct Key *key); void BKE_key_free_nolib(struct Key *key); struct Key *BKE_key_add(struct Main *bmain, struct ID *id); struct Key *BKE_key_copy(struct Main *bmain, const struct Key *key); @@ -124,7 +124,7 @@ void BKE_keyblock_data_get(const struct Key *key, float (*arr)[3]); void BKE_keyblock_data_set_with_mat4(struct Key *key, const int shape_index, - const float (*vertices)[3], + const float (*coords)[3], const float mat[4][4]); void BKE_keyblock_curve_data_set_with_mat4(struct Key *key, const struct ListBase *nurb, diff --git a/source/blender/blenkernel/BKE_lattice.h b/source/blender/blenkernel/BKE_lattice.h index 03c57d4caac..ee7744ece15 100644 --- a/source/blender/blenkernel/BKE_lattice.h +++ b/source/blender/blenkernel/BKE_lattice.h @@ -58,7 +58,7 @@ void BKE_lattice_modifiers_calc(struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob); -struct MDeformVert *BKE_lattice_deform_verts_get(const struct Object *lattice); +struct MDeformVert *BKE_lattice_deform_verts_get(const struct Object *oblatt); struct BPoint *BKE_lattice_active_point_get(struct Lattice *lt); struct BoundBox *BKE_lattice_boundbox_get(struct Object *ob); @@ -115,7 +115,7 @@ void BKE_lattice_deform_coords(const struct Object *ob_lattice, const int vert_coords_len, const short flag, const char *defgrp_name, - float influence); + float fac); void BKE_lattice_deform_coords_with_mesh(const struct Object *ob_lattice, const struct Object *ob_target, @@ -123,7 +123,7 @@ void BKE_lattice_deform_coords_with_mesh(const struct Object *ob_lattice, const int vert_coords_len, const short flag, const char *defgrp_name, - const float influence, + const float fac, const struct Mesh *me_target); void BKE_lattice_deform_coords_with_editmesh(const struct Object *ob_lattice, @@ -132,7 +132,7 @@ void BKE_lattice_deform_coords_with_editmesh(const struct Object *ob_lattice, const int vert_coords_len, const short flag, const char *defgrp_name, - const float influence, + const float fac, struct BMEditMesh *em_target); /** \} */ diff --git a/source/blender/blenkernel/BKE_lib_id.h b/source/blender/blenkernel/BKE_lib_id.h index 7768e903ac3..62b4b295410 100644 --- a/source/blender/blenkernel/BKE_lib_id.h +++ b/source/blender/blenkernel/BKE_lib_id.h @@ -264,7 +264,7 @@ void BKE_main_id_repair_duplicate_names_listbase(struct ListBase *lb); #define MAX_ID_FULL_NAME (64 + 64 + 3 + 1) /* 64 is MAX_ID_NAME - 2 */ #define MAX_ID_FULL_NAME_UI (MAX_ID_FULL_NAME + 3) /* Adds 'keycode' two letters at beginning. */ -void BKE_id_full_name_get(char name[MAX_ID_FULL_NAME], const struct ID *id, char separator_str); +void BKE_id_full_name_get(char name[MAX_ID_FULL_NAME], const struct ID *id, char separator_char); void BKE_id_full_name_ui_prefix_get(char name[MAX_ID_FULL_NAME_UI], const struct ID *id, const bool add_lib_hint, diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h index 2187ab6b9f5..0ccd246aaf4 100644 --- a/source/blender/blenkernel/BKE_main.h +++ b/source/blender/blenkernel/BKE_main.h @@ -225,7 +225,7 @@ void BKE_main_thumbnail_create(struct Main *bmain); const char *BKE_main_blendfile_path(const struct Main *bmain) ATTR_NONNULL(); const char *BKE_main_blendfile_path_from_global(void); -struct ListBase *which_libbase(struct Main *mainlib, short type); +struct ListBase *which_libbase(struct Main *bmain, short type); #define MAX_LIBARRAY 41 int set_listbasepointers(struct Main *main, struct ListBase *lb[MAX_LIBARRAY]); diff --git a/source/blender/blenkernel/BKE_main_idmap.h b/source/blender/blenkernel/BKE_main_idmap.h index b89714cefa4..bffb12a5136 100644 --- a/source/blender/blenkernel/BKE_main_idmap.h +++ b/source/blender/blenkernel/BKE_main_idmap.h @@ -49,19 +49,19 @@ struct IDNameLib_Map *BKE_main_idmap_create(struct Main *bmain, struct Main *old_bmain, const int idmap_types) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); -void BKE_main_idmap_destroy(struct IDNameLib_Map *id_typemap) ATTR_NONNULL(); -struct Main *BKE_main_idmap_main_get(struct IDNameLib_Map *id_typemap) ATTR_WARN_UNUSED_RESULT +void BKE_main_idmap_destroy(struct IDNameLib_Map *id_map) ATTR_NONNULL(); +struct Main *BKE_main_idmap_main_get(struct IDNameLib_Map *id_map) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); -struct ID *BKE_main_idmap_lookup_name(struct IDNameLib_Map *id_typemap, +struct ID *BKE_main_idmap_lookup_name(struct IDNameLib_Map *id_map, short id_type, const char *name, const struct Library *lib) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 3); -struct ID *BKE_main_idmap_lookup_id(struct IDNameLib_Map *id_typemap, +struct ID *BKE_main_idmap_lookup_id(struct IDNameLib_Map *id_map, const struct ID *id) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2); -struct ID *BKE_main_idmap_lookup_uuid(struct IDNameLib_Map *id_typemap, +struct ID *BKE_main_idmap_lookup_uuid(struct IDNameLib_Map *id_map, const uint session_uuid) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); diff --git a/source/blender/blenkernel/BKE_mask.h b/source/blender/blenkernel/BKE_mask.h index ab731c5e42f..5da8332cc53 100644 --- a/source/blender/blenkernel/BKE_mask.h +++ b/source/blender/blenkernel/BKE_mask.h @@ -80,7 +80,7 @@ void BKE_mask_layer_rename(struct Mask *mask, char *oldname, char *newname); -struct MaskLayer *BKE_mask_layer_copy(const struct MaskLayer *layer); +struct MaskLayer *BKE_mask_layer_copy(const struct MaskLayer *masklay); void BKE_mask_layer_copy_list(struct ListBase *masklayers_new, const struct ListBase *masklayers); /* splines */ diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index 045563f8e52..6e8c67dde5f 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -119,7 +119,7 @@ struct Mesh *BKE_mesh_new_nomain_from_template_ex(const struct Mesh *me_src, int polys_len, struct CustomData_MeshMasks mask); -void BKE_mesh_eval_delete(struct Mesh *me_eval); +void BKE_mesh_eval_delete(struct Mesh *mesh_eval); /* Performs copy for use during evaluation, * optional referencing original arrays to reduce memory. */ @@ -256,7 +256,7 @@ void BKE_mesh_vert_coords_apply_with_mat4(struct Mesh *mesh, const float (*vert_coords)[3], const float mat[4][4]); void BKE_mesh_vert_coords_apply(struct Mesh *mesh, const float (*vert_coords)[3]); -void BKE_mesh_vert_normals_apply(struct Mesh *mesh, const short (*vertNormals)[3]); +void BKE_mesh_vert_normals_apply(struct Mesh *mesh, const short (*vert_normals)[3]); /* *** mesh_evaluate.c *** */ @@ -504,7 +504,7 @@ void BKE_mesh_loops_to_mface_corners(struct CustomData *fdata, int findex, const int polyindex, const int mf_len, - const int numTex, + const int numUV, const int numCol, const bool hasPCol, const bool hasOrigSpace, @@ -669,7 +669,7 @@ void BKE_mesh_calc_edges_tessface(struct Mesh *mesh); /* In DerivedMesh.c */ void BKE_mesh_wrapper_deferred_finalize(struct Mesh *me_eval, - const CustomData_MeshMasks *final_datamask); + const CustomData_MeshMasks *cd_mask_finalize); /* **** Depsgraph evaluation **** */ diff --git a/source/blender/blenkernel/BKE_mesh_mapping.h b/source/blender/blenkernel/BKE_mesh_mapping.h index cbd992bbbec..327c13c7ce4 100644 --- a/source/blender/blenkernel/BKE_mesh_mapping.h +++ b/source/blender/blenkernel/BKE_mesh_mapping.h @@ -107,17 +107,17 @@ void BKE_mesh_uv_vert_map_free(UvVertMap *vmap); void BKE_mesh_vert_poly_map_create(MeshElemMap **r_map, int **r_mem, - const struct MPoly *mface, + const struct MPoly *mpoly, const struct MLoop *mloop, int totvert, - int totface, + int totpoly, int totloop); void BKE_mesh_vert_loop_map_create(MeshElemMap **r_map, int **r_mem, - const struct MPoly *mface, + const struct MPoly *mpoly, const struct MLoop *mloop, int totvert, - int totface, + int totpoly, int totloop); void BKE_mesh_vert_looptri_map_create(MeshElemMap **r_map, int **r_mem, @@ -149,7 +149,7 @@ void BKE_mesh_edge_poly_map_create(MeshElemMap **r_map, const int totloop); void BKE_mesh_origindex_map_create(MeshElemMap **r_map, int **r_mem, - const int totorig, + const int totsource, const int *final_origindex, const int totfinal); void BKE_mesh_origindex_map_create_looptri(MeshElemMap **r_map, @@ -188,14 +188,14 @@ typedef struct MeshIslandStore { void BKE_mesh_loop_islands_init(MeshIslandStore *island_store, const short item_type, - const int item_num, + const int items_num, const short island_type, const short innercut_type); void BKE_mesh_loop_islands_clear(MeshIslandStore *island_store); void BKE_mesh_loop_islands_free(MeshIslandStore *island_store); -void BKE_mesh_loop_islands_add(MeshIslandStore *islands, +void BKE_mesh_loop_islands_add(MeshIslandStore *island_store, const int item_num, - const int *item_indices, + const int *items_indices, const int num_island_items, int *island_item_indices, const int num_innercut_items, diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index 98dc411239e..02b9b547314 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -423,7 +423,7 @@ void BKE_modifier_session_uuid_generate(struct ModifierData *md); bool BKE_modifier_unique_name(struct ListBase *modifiers, struct ModifierData *md); void BKE_modifier_copydata_generic(const struct ModifierData *md, - struct ModifierData *target, + struct ModifierData *md_dst, const int flag); void BKE_modifier_copydata(struct ModifierData *md, struct ModifierData *target); void BKE_modifier_copydata_ex(struct ModifierData *md, diff --git a/source/blender/blenkernel/BKE_movieclip.h b/source/blender/blenkernel/BKE_movieclip.h index 958fbef1f97..5321f827143 100644 --- a/source/blender/blenkernel/BKE_movieclip.h +++ b/source/blender/blenkernel/BKE_movieclip.h @@ -39,9 +39,9 @@ struct MovieClip *BKE_movieclip_copy(struct Main *bmain, const struct MovieClip struct MovieClip *BKE_movieclip_file_add(struct Main *bmain, const char *name); struct MovieClip *BKE_movieclip_file_add_exists_ex(struct Main *bmain, - const char *name, + const char *filepath, bool *r_exists); -struct MovieClip *BKE_movieclip_file_add_exists(struct Main *bmain, const char *name); +struct MovieClip *BKE_movieclip_file_add_exists(struct Main *bmain, const char *filepath); void BKE_movieclip_reload(struct Main *bmain, struct MovieClip *clip); void BKE_movieclip_clear_cache(struct MovieClip *clip); void BKE_movieclip_clear_proxy_cache(struct MovieClip *clip); diff --git a/source/blender/blenkernel/BKE_multires.h b/source/blender/blenkernel/BKE_multires.h index db2dc7ec87f..fbdfc5b76a7 100644 --- a/source/blender/blenkernel/BKE_multires.h +++ b/source/blender/blenkernel/BKE_multires.h @@ -151,7 +151,7 @@ void multiresModifier_ensure_external_read(struct Mesh *mesh, void old_mdisps_bilinear(float out[3], float (*disps)[3], const int st, float u, float v); int mdisp_rot_face_to_crn(struct MVert *mvert, struct MPoly *mpoly, - struct MLoop *mloops, + struct MLoop *mloop, const struct MLoopTri *lt, const int face_side, const float u, diff --git a/source/blender/blenkernel/BKE_nla.h b/source/blender/blenkernel/BKE_nla.h index 4cded6b9d6a..690dd790e03 100644 --- a/source/blender/blenkernel/BKE_nla.h +++ b/source/blender/blenkernel/BKE_nla.h @@ -65,7 +65,7 @@ struct NlaStrip *BKE_nlastrip_new(struct bAction *act); struct NlaStrip *BKE_nlastack_add_strip(struct AnimData *adt, struct bAction *act); struct NlaStrip *BKE_nla_add_soundstrip(struct Main *bmain, struct Scene *scene, - struct Speaker *spk); + struct Speaker *speaker); void BKE_nla_strip_foreach_id(struct NlaStrip *strip, struct LibraryForeachIDData *data); diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 91e3b85aaca..3829000a045 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -434,7 +434,7 @@ bool ntreeHasType(const struct bNodeTree *ntree, int type); bool ntreeHasTree(const struct bNodeTree *ntree, const struct bNodeTree *lookup); void ntreeUpdateTree(struct Main *main, struct bNodeTree *ntree); void ntreeUpdateAllNew(struct Main *main); -void ntreeUpdateAllUsers(struct Main *main, struct ID *id); +void ntreeUpdateAllUsers(struct Main *main, struct ID *ngroup); void ntreeGetDependencyList(struct bNodeTree *ntree, struct bNode ***deplist, int *totnodes); @@ -1221,7 +1221,7 @@ void ntreeCompositExecTree(struct Scene *scene, const struct ColorManagedViewSettings *view_settings, const struct ColorManagedDisplaySettings *display_settings, const char *view_name); -void ntreeCompositTagRender(struct Scene *sce); +void ntreeCompositTagRender(struct Scene *scene); void ntreeCompositUpdateRLayers(struct bNodeTree *ntree); void ntreeCompositRegisterPass(struct bNodeTree *ntree, struct Scene *scene, @@ -1302,7 +1302,7 @@ struct bNodeTreeExec *ntreeTexBeginExecTree(struct bNodeTree *ntree); void ntreeTexEndExecTree(struct bNodeTreeExec *exec); int ntreeTexExecTree(struct bNodeTree *ntree, struct TexResult *target, - float coord[3], + float co[3], float dxt[3], float dyt[3], int osatex, diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index 9f006ea21ef..ca548e21a85 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -84,7 +84,7 @@ void BKE_object_free_shaderfx(struct Object *ob, const int flag); void BKE_object_make_proxy(struct Main *bmain, struct Object *ob, struct Object *target, - struct Object *gob); + struct Object *cob); void BKE_object_copy_proxy_drivers(struct Object *ob, struct Object *target); bool BKE_object_exists_check(struct Main *bmain, const struct Object *obtest); @@ -142,7 +142,7 @@ struct Object *BKE_object_duplicate(struct Main *bmain, uint dupflag, const uint duplicate_options); -void BKE_object_obdata_size_init(struct Object *ob, const float scale); +void BKE_object_obdata_size_init(struct Object *ob, const float size); void BKE_object_scale_to_mat3(struct Object *ob, float r_mat[3][3]); void BKE_object_rot_to_mat3(const struct Object *ob, float r_mat[3][3], bool use_drot); diff --git a/source/blender/blenkernel/BKE_packedFile.h b/source/blender/blenkernel/BKE_packedFile.h index 1e8721045cd..9890399f8a2 100644 --- a/source/blender/blenkernel/BKE_packedFile.h +++ b/source/blender/blenkernel/BKE_packedFile.h @@ -59,7 +59,7 @@ enum ePF_FileStatus { struct PackedFile *BKE_packedfile_duplicate(const struct PackedFile *pf_src); struct PackedFile *BKE_packedfile_new(struct ReportList *reports, const char *filename, - const char *relabase); + const char *basepath); struct PackedFile *BKE_packedfile_new_from_memory(void *mem, int memlen); void BKE_packedfile_pack_all(struct Main *bmain, struct ReportList *reports, bool verbose); diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index 7d317538f44..7b60bd9ff7d 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -347,7 +347,7 @@ void copy_particle_key(struct ParticleKey *to, struct ParticleKey *from, int tim void psys_emitter_customdata_mask(struct ParticleSystem *psys, struct CustomData_MeshMasks *r_cddata_masks); void psys_particle_on_emitter(struct ParticleSystemModifierData *psmd, - int distr, + int from, int index, int index_dmcache, float fuv[4], @@ -395,7 +395,7 @@ int do_guides(struct Depsgraph *depsgraph, struct ParticleSettings *part, struct ListBase *effectors, ParticleKey *state, - int pa_num, + int index, float time); void precalc_guides(struct ParticleSimulationData *sim, struct ListBase *effectors); float psys_get_timestep(struct ParticleSimulationData *sim); diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h index 9826dfaa4a5..c3d107105a9 100644 --- a/source/blender/blenkernel/BKE_pbvh.h +++ b/source/blender/blenkernel/BKE_pbvh.h @@ -114,7 +114,7 @@ void BKE_pbvh_build_mesh(PBVH *pbvh, const struct MLoopTri *looptri, int looptri_num); void BKE_pbvh_build_grids(PBVH *pbvh, - struct CCGElem **grid_elems, + struct CCGElem **grids, int totgrid, struct CCGKey *key, void **gridfaces, @@ -275,7 +275,7 @@ void BKE_pbvh_node_get_grids(PBVH *pbvh, int *totgrid, int *maxgrid, int *gridsize, - struct CCGElem ***grid_elems); + struct CCGElem ***r_griddata); void BKE_pbvh_node_num_verts(PBVH *pbvh, PBVHNode *node, int *r_uniquevert, int *r_totvert); void BKE_pbvh_node_get_verts(PBVH *pbvh, PBVHNode *node, @@ -307,7 +307,7 @@ void BKE_pbvh_update_normals(PBVH *pbvh, struct SubdivCCG *subdiv_ccg); void BKE_pbvh_redraw_BB(PBVH *pbvh, float bb_min[3], float bb_max[3]); void BKE_pbvh_get_grid_updates(PBVH *pbvh, bool clear, void ***r_gridfaces, int *r_totface); void BKE_pbvh_grids_update(PBVH *pbvh, - struct CCGElem **grid_elems, + struct CCGElem **grids, void **gridfaces, struct DMFlagMat *flagmats, unsigned int **grid_hidden); @@ -458,7 +458,7 @@ void pbvh_vertex_iter_init(PBVH *pbvh, PBVHNode *node, PBVHVertexIter *vi, int m void BKE_pbvh_node_get_proxies(PBVHNode *node, PBVHProxyNode **proxies, int *proxy_count); void BKE_pbvh_node_free_proxies(PBVHNode *node); PBVHProxyNode *BKE_pbvh_node_add_proxy(PBVH *pbvh, PBVHNode *node); -void BKE_pbvh_gather_proxies(PBVH *pbvh, PBVHNode ***nodes, int *totnode); +void BKE_pbvh_gather_proxies(PBVH *pbvh, PBVHNode ***r_array, int *r_tot); void BKE_pbvh_node_get_bm_orco_data(PBVHNode *node, int (**r_orco_tris)[3], int *r_orco_tris_num, diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h index 05966ec3989..20190817a8e 100644 --- a/source/blender/blenkernel/BKE_scene.h +++ b/source/blender/blenkernel/BKE_scene.h @@ -132,8 +132,9 @@ float BKE_scene_frame_to_ctime(const struct Scene *scene, const float frame); void BKE_scene_frame_set(struct Scene *scene, double cfra); struct TransformOrientationSlot *BKE_scene_orientation_slot_get_from_flag(struct Scene *scene, - int slot_index); -struct TransformOrientationSlot *BKE_scene_orientation_slot_get(struct Scene *scene, int flag); + int flag); +struct TransformOrientationSlot *BKE_scene_orientation_slot_get(struct Scene *scene, + int slot_index); void BKE_scene_orientation_slot_set_index(struct TransformOrientationSlot *orient_slot, int orientation); int BKE_scene_orientation_slot_get_index(const struct TransformOrientationSlot *orient_slot); @@ -156,7 +157,7 @@ struct SceneRenderView *BKE_scene_add_render_view(struct Scene *sce, const char bool BKE_scene_remove_render_view(struct Scene *scene, struct SceneRenderView *srv); /* render profile */ -int get_render_subsurf_level(const struct RenderData *r, int level, bool for_render); +int get_render_subsurf_level(const struct RenderData *r, int lvl, bool for_render); int get_render_child_particle_number(const struct RenderData *r, int num, bool for_render); bool BKE_scene_use_shading_nodes_custom(struct Scene *scene); diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h index fd881175872..04be46f0ccf 100644 --- a/source/blender/blenkernel/BKE_sequencer.h +++ b/source/blender/blenkernel/BKE_sequencer.h @@ -263,10 +263,10 @@ struct Mask *BKE_sequencer_mask_get(struct Scene *scene); /* apply functions recursively */ int BKE_sequencer_base_recursive_apply(struct ListBase *seqbase, - int (*apply_func)(struct Sequence *seq, void *), + int (*apply_fn)(struct Sequence *seq, void *), void *arg); int BKE_sequencer_recursive_apply(struct Sequence *seq, - int (*apply_func)(struct Sequence *, void *), + int (*apply_fn)(struct Sequence *, void *), void *arg); /* maintenance functions, mostly for RNA */ @@ -319,7 +319,7 @@ bool BKE_sequencer_proxy_rebuild_context(struct Main *bmain, void BKE_sequencer_proxy_rebuild(struct SeqIndexBuildContext *context, short *stop, short *do_update, - float *num_frames_prefetched); + float *progress); void BKE_sequencer_proxy_rebuild_finish(struct SeqIndexBuildContext *context, bool stop); void BKE_sequencer_proxy_set(struct Sequence *seq, bool value); @@ -340,7 +340,7 @@ void BKE_sequencer_cache_put(const SeqRenderData *context, struct Sequence *seq, float cfra, int type, - struct ImBuf *nval, + struct ImBuf *i, float cost, bool skip_disk_cache); bool BKE_sequencer_cache_put_if_possible(const SeqRenderData *context, diff --git a/source/blender/blenkernel/BKE_shader_fx.h b/source/blender/blenkernel/BKE_shader_fx.h index 1eb52b389d1..805b974b673 100644 --- a/source/blender/blenkernel/BKE_shader_fx.h +++ b/source/blender/blenkernel/BKE_shader_fx.h @@ -167,7 +167,7 @@ typedef struct ShaderFxTypeInfo { /* Initialize global data (type info and some common global storages). */ void BKE_shaderfx_init(void); -void BKE_shaderfxType_panel_id(ShaderFxType type, char *panel_id); +void BKE_shaderfxType_panel_id(ShaderFxType type, char *r_idname); const ShaderFxTypeInfo *BKE_shaderfx_get_info(ShaderFxType type); struct ShaderFxData *BKE_shaderfx_new(int type); void BKE_shaderfx_free_ex(struct ShaderFxData *fx, const int flag); diff --git a/source/blender/blenkernel/BKE_softbody.h b/source/blender/blenkernel/BKE_softbody.h index 28d299679ed..b0923be8434 100644 --- a/source/blender/blenkernel/BKE_softbody.h +++ b/source/blender/blenkernel/BKE_softbody.h @@ -59,7 +59,7 @@ extern void sbFreeSimulation(struct SoftBody *sb); extern void sbObjectStep(struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob, - float framnr, + float cfra, float (*vertexCos)[3], int numVerts); diff --git a/source/blender/blenkernel/BKE_studiolight.h b/source/blender/blenkernel/BKE_studiolight.h index 32c571e5f91..614523be123 100644 --- a/source/blender/blenkernel/BKE_studiolight.h +++ b/source/blender/blenkernel/BKE_studiolight.h @@ -153,7 +153,7 @@ void BKE_studiolight_preview(uint *icon_buffer, StudioLight *sl, int icon_id_typ struct ListBase *BKE_studiolight_listbase(void); void BKE_studiolight_ensure_flag(StudioLight *sl, int flag); void BKE_studiolight_refresh(void); -StudioLight *BKE_studiolight_load(const char *path, int orientation); +StudioLight *BKE_studiolight_load(const char *path, int type); StudioLight *BKE_studiolight_create(const char *path, const SolidLight light[4], const float light_ambient[3]); diff --git a/source/blender/blenkernel/BKE_subdiv_eval.h b/source/blender/blenkernel/BKE_subdiv_eval.h index 204e802da6e..0b61e62c89c 100644 --- a/source/blender/blenkernel/BKE_subdiv_eval.h +++ b/source/blender/blenkernel/BKE_subdiv_eval.h @@ -82,7 +82,7 @@ void BKE_subdiv_eval_face_varying(struct Subdiv *subdiv, const int ptex_face_index, const float u, const float v, - float r_varying[2]); + float r_face_varying[2]); /* NOTE: Expects derivatives to be correct. * diff --git a/source/blender/blenkernel/BKE_text.h b/source/blender/blenkernel/BKE_text.h index 289ad351429..9d5308de280 100644 --- a/source/blender/blenkernel/BKE_text.h +++ b/source/blender/blenkernel/BKE_text.h @@ -89,8 +89,8 @@ int txt_setcurr_tab_spaces(struct Text *text, int space); bool txt_cursor_is_line_start(struct Text *text); bool txt_cursor_is_line_end(struct Text *text); -int txt_calc_tab_left(struct TextLine *line, int ch); -int txt_calc_tab_right(struct TextLine *line, int ch); +int txt_calc_tab_left(struct TextLine *tl, int ch); +int txt_calc_tab_right(struct TextLine *tl, int ch); /* utility functions, could be moved somewhere more generic but are python/text related */ int text_check_bracket(const char ch); @@ -111,7 +111,7 @@ enum { }; /* Fast non-validating buffer conversion for undo. */ -char *txt_to_buf_for_undo(struct Text *text, int *r_buf_strlen); +char *txt_to_buf_for_undo(struct Text *text, int *r_buf_len); void txt_from_buf_for_undo(struct Text *text, const char *buf, int buf_len); #ifdef __cplusplus diff --git a/source/blender/blenkernel/BKE_tracking.h b/source/blender/blenkernel/BKE_tracking.h index 2d763132923..39cb82b25c3 100644 --- a/source/blender/blenkernel/BKE_tracking.h +++ b/source/blender/blenkernel/BKE_tracking.h @@ -292,7 +292,7 @@ void BKE_tracking_max_distortion_delta_across_bound(struct MovieTracking *tracki /* **** Image sampling **** */ struct ImBuf *BKE_tracking_sample_pattern(int frame_width, int frame_height, - struct ImBuf *struct_ibuf, + struct ImBuf *search_ib, struct MovieTrackingTrack *track, struct MovieTrackingMarker *marker, bool from_anchor, @@ -376,7 +376,7 @@ void BKE_tracking_reconstruction_scale(struct MovieTracking *tracking, float sca /* **** Feature detection **** */ void BKE_tracking_detect_fast(struct MovieTracking *tracking, struct ListBase *tracksbase, - struct ImBuf *imbuf, + struct ImBuf *ibuf, int framenr, int margin, int min_trackness, diff --git a/source/blender/blenkernel/intern/CCGSubSurf.c b/source/blender/blenkernel/intern/CCGSubSurf.c index c572b1dacf0..e3543290b65 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.c +++ b/source/blender/blenkernel/intern/CCGSubSurf.c @@ -1478,30 +1478,30 @@ void ccgVertIterator_next(CCGVertIterator *vi) ccg_ehashIterator_next((EHashIterator *)vi); } -CCGEdge *ccgEdgeIterator_getCurrent(CCGEdgeIterator *vi) +CCGEdge *ccgEdgeIterator_getCurrent(CCGEdgeIterator *ei) { - return (CCGEdge *)ccg_ehashIterator_getCurrent((EHashIterator *)vi); + return (CCGEdge *)ccg_ehashIterator_getCurrent((EHashIterator *)ei); } -int ccgEdgeIterator_isStopped(CCGEdgeIterator *vi) +int ccgEdgeIterator_isStopped(CCGEdgeIterator *ei) { - return ccg_ehashIterator_isStopped((EHashIterator *)vi); + return ccg_ehashIterator_isStopped((EHashIterator *)ei); } -void ccgEdgeIterator_next(CCGEdgeIterator *vi) +void ccgEdgeIterator_next(CCGEdgeIterator *ei) { - ccg_ehashIterator_next((EHashIterator *)vi); + ccg_ehashIterator_next((EHashIterator *)ei); } -CCGFace *ccgFaceIterator_getCurrent(CCGFaceIterator *vi) +CCGFace *ccgFaceIterator_getCurrent(CCGFaceIterator *fi) { - return (CCGFace *)ccg_ehashIterator_getCurrent((EHashIterator *)vi); + return (CCGFace *)ccg_ehashIterator_getCurrent((EHashIterator *)fi); } -int ccgFaceIterator_isStopped(CCGFaceIterator *vi) +int ccgFaceIterator_isStopped(CCGFaceIterator *fi) { - return ccg_ehashIterator_isStopped((EHashIterator *)vi); + return ccg_ehashIterator_isStopped((EHashIterator *)fi); } -void ccgFaceIterator_next(CCGFaceIterator *vi) +void ccgFaceIterator_next(CCGFaceIterator *fi) { - ccg_ehashIterator_next((EHashIterator *)vi); + ccg_ehashIterator_next((EHashIterator *)fi); } /*** Extern API final vert/edge/face interface ***/ diff --git a/source/blender/blenkernel/intern/CCGSubSurf.h b/source/blender/blenkernel/intern/CCGSubSurf.h index e1805a9c512..a9e0d6882c1 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.h +++ b/source/blender/blenkernel/intern/CCGSubSurf.h @@ -72,7 +72,7 @@ typedef enum { /***/ CCGSubSurf *ccgSubSurf_new(CCGMeshIFC *ifc, - int subdivisionLevels, + int subdivLevels, CCGAllocatorIFC *allocatorIFC, CCGAllocatorHDL allocator); void ccgSubSurf_free(CCGSubSurf *ss); @@ -100,11 +100,14 @@ CCGError ccgSubSurf_syncFaceDel(CCGSubSurf *ss, CCGFaceHDL fHDL); CCGError ccgSubSurf_processSync(CCGSubSurf *ss); -CCGError ccgSubSurf_updateFromFaces(CCGSubSurf *ss, int lvl, CCGFace **faces, int numFaces); -CCGError ccgSubSurf_updateToFaces(CCGSubSurf *ss, int lvl, CCGFace **faces, int numFaces); -CCGError ccgSubSurf_updateNormals(CCGSubSurf *ss, CCGFace **faces, int numFaces); -CCGError ccgSubSurf_updateLevels(CCGSubSurf *ss, int lvl, CCGFace **faces, int numFaces); -CCGError ccgSubSurf_stitchFaces(CCGSubSurf *ss, int lvl, CCGFace **faces, int numFaces); +CCGError ccgSubSurf_updateFromFaces(CCGSubSurf *ss, + int lvl, + CCGFace **effectedF, + int numEffectedF); +CCGError ccgSubSurf_updateToFaces(CCGSubSurf *ss, int lvl, CCGFace **effectedF, int numEffectedF); +CCGError ccgSubSurf_updateNormals(CCGSubSurf *ss, CCGFace **effectedF, int numEffectedF); +CCGError ccgSubSurf_updateLevels(CCGSubSurf *ss, int lvl, CCGFace **effectedF, int numEffectedF); +CCGError ccgSubSurf_stitchFaces(CCGSubSurf *ss, int lvl, CCGFace **effectedF, int numEffectedF); CCGError ccgSubSurf_setSubdivisionLevels(CCGSubSurf *ss, int subdivisionLevels); diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c index 0c0ad7a57ab..45d44a6829e 100644 --- a/source/blender/blenkernel/intern/camera.c +++ b/source/blender/blenkernel/intern/camera.c @@ -221,15 +221,15 @@ void BKE_camera_params_init(CameraParams *params) params->clip_end = 100.0f; } -void BKE_camera_params_from_object(CameraParams *params, const Object *ob) +void BKE_camera_params_from_object(CameraParams *params, const Object *cam_ob) { - if (!ob) { + if (!cam_ob) { return; } - if (ob->type == OB_CAMERA) { + if (cam_ob->type == OB_CAMERA) { /* camera object */ - Camera *cam = ob->data; + Camera *cam = cam_ob->data; if (cam->type == CAM_ORTHO) { params->is_ortho = true; @@ -247,9 +247,9 @@ void BKE_camera_params_from_object(CameraParams *params, const Object *ob) params->clip_start = cam->clip_start; params->clip_end = cam->clip_end; } - else if (ob->type == OB_LAMP) { + else if (cam_ob->type == OB_LAMP) { /* light object */ - Light *la = ob->data; + Light *la = cam_ob->data; params->lens = 16.0f / tanf(la->spotsize * 0.5f); if (params->lens == 0.0f) { params->lens = 35.0f; @@ -305,13 +305,13 @@ void BKE_camera_params_from_view3d(CameraParams *params, } void BKE_camera_params_compute_viewplane( - CameraParams *params, int winx, int winy, float xasp, float yasp) + CameraParams *params, int winx, int winy, float aspx, float aspy) { rctf viewplane; float pixsize, viewfac, sensor_size, dx, dy; int sensor_fit; - params->ycor = yasp / xasp; + params->ycor = aspy / aspx; if (params->is_ortho) { /* orthographic camera */ @@ -325,7 +325,7 @@ void BKE_camera_params_compute_viewplane( } /* determine sensor fit */ - sensor_fit = BKE_camera_sensor_fit(params->sensor_fit, xasp * winx, yasp * winy); + sensor_fit = BKE_camera_sensor_fit(params->sensor_fit, aspx * winx, aspy * winy); if (sensor_fit == CAMERA_SENSOR_FIT_HOR) { viewfac = winx; diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 4ac6399c4e4..7fe8834c2ec 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -3848,15 +3848,15 @@ static bool is_free_auto_point(BezTriple *bezt) return BEZT_IS_AUTOH(bezt) && bezt->f5 == HD_AUTOTYPE_NORMAL; } -void BKE_nurb_handle_smooth_fcurve(BezTriple *bezt, int total, bool cycle) +void BKE_nurb_handle_smooth_fcurve(BezTriple *bezt, int total, bool cyclic) { /* ignore cyclic extrapolation if end points are locked */ - cycle = cycle && is_free_auto_point(&bezt[0]) && is_free_auto_point(&bezt[total - 1]); + cyclic = cyclic && is_free_auto_point(&bezt[0]) && is_free_auto_point(&bezt[total - 1]); /* if cyclic, try to find a sequence break point */ int search_base = 0; - if (cycle) { + if (cyclic) { for (int i = 1; i < total - 1; i++) { if (!is_free_auto_point(&bezt[i])) { search_base = i; @@ -3866,7 +3866,7 @@ void BKE_nurb_handle_smooth_fcurve(BezTriple *bezt, int total, bool cycle) /* all points of the curve are freely changeable auto handles - solve as full cycle */ if (search_base == 0) { - bezier_handle_calc_smooth_fcurve(bezt, total, 0, total, cycle); + bezier_handle_calc_smooth_fcurve(bezt, total, 0, total, cyclic); return; } } @@ -3877,13 +3877,13 @@ void BKE_nurb_handle_smooth_fcurve(BezTriple *bezt, int total, bool cycle) for (int i = 1, j = start + 1; i < total; i++, j++) { /* in cyclic mode: jump from last to first point when necessary */ - if (j == total - 1 && cycle) { + if (j == total - 1 && cyclic) { j = 0; } /* non auto handle closes the list (we come here at least for the last handle, see above) */ if (!is_free_auto_point(&bezt[j])) { - bezier_handle_calc_smooth_fcurve(bezt, total, start, count + 1, cycle); + bezier_handle_calc_smooth_fcurve(bezt, total, start, count + 1, cyclic); start = j; count = 1; } @@ -3893,7 +3893,7 @@ void BKE_nurb_handle_smooth_fcurve(BezTriple *bezt, int total, bool cycle) } if (count > 1) { - bezier_handle_calc_smooth_fcurve(bezt, total, start, count, cycle); + bezier_handle_calc_smooth_fcurve(bezt, total, start, count, cyclic); } } diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 909a4d42f0a..5a5fb7a36df 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -4271,7 +4271,7 @@ void CustomData_to_bmesh_block(const CustomData *source, void CustomData_from_bmesh_block(const CustomData *source, CustomData *dest, void *src_block, - int dst_index) + int dest_index) { int dest_i, src_i; @@ -4297,7 +4297,7 @@ void CustomData_from_bmesh_block(const CustomData *source, int offset = source->layers[src_i].offset; const void *src_data = POINTER_OFFSET(src_block, offset); void *dst_data = POINTER_OFFSET(dest->layers[dest_i].data, - (size_t)dst_index * typeInfo->size); + (size_t)dest_index * typeInfo->size); if (typeInfo->copy) { typeInfo->copy(src_data, dst_data, 1); diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c index 00fd30da4cd..74a8a4268fc 100644 --- a/source/blender/blenkernel/intern/deform.c +++ b/source/blender/blenkernel/intern/deform.c @@ -944,7 +944,7 @@ float BKE_defvert_lock_relative_weight(float weight, /** \name Defvert Array functions * \{ */ -void BKE_defvert_array_copy(MDeformVert *dst, const MDeformVert *src, int copycount) +void BKE_defvert_array_copy(MDeformVert *dst, const MDeformVert *src, int totvert) { /* Assumes dst is already set up */ int i; @@ -953,9 +953,9 @@ void BKE_defvert_array_copy(MDeformVert *dst, const MDeformVert *src, int copyco return; } - memcpy(dst, src, copycount * sizeof(MDeformVert)); + memcpy(dst, src, totvert * sizeof(MDeformVert)); - for (i = 0; i < copycount; i++) { + for (i = 0; i < totvert; i++) { if (src[i].dw) { dst[i].dw = MEM_mallocN(sizeof(MDeformWeight) * src[i].totweight, "copy_deformWeight"); memcpy(dst[i].dw, src[i].dw, sizeof(MDeformWeight) * src[i].totweight); diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c index ee7d85ba3fb..04f3b4f64d6 100644 --- a/source/blender/blenkernel/intern/fluid.c +++ b/source/blender/blenkernel/intern/fluid.c @@ -555,7 +555,7 @@ static void manta_smoke_calc_transparency(FluidDomainSettings *fds, ViewLayer *v static float calc_voxel_transp( float *result, const float *input, int res[3], int *pixel, float *t_ray, float correct); static void update_distances(int index, - float *fesh_distances, + float *distance_map, BVHTreeFromMesh *tree_data, const float ray_start[3], float surface_thickness, diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index 661d27f4765..7195ebda5ff 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -538,19 +538,19 @@ void IDP_SyncGroupValues(IDProperty *dest, const IDProperty *src) } } -void IDP_SyncGroupTypes(IDProperty *dst, const IDProperty *src, const bool do_arraylen) +void IDP_SyncGroupTypes(IDProperty *dest, const IDProperty *src, const bool do_arraylen) { IDProperty *prop_dst, *prop_dst_next; const IDProperty *prop_src; - for (prop_dst = dst->data.group.first; prop_dst; prop_dst = prop_dst_next) { + for (prop_dst = dest->data.group.first; prop_dst; prop_dst = prop_dst_next) { prop_dst_next = prop_dst->next; if ((prop_src = IDP_GetPropertyFromGroup((IDProperty *)src, prop_dst->name))) { /* check of we should replace? */ if ((prop_dst->type != prop_src->type || prop_dst->subtype != prop_src->subtype) || (do_arraylen && ELEM(prop_dst->type, IDP_ARRAY, IDP_IDPARRAY) && (prop_src->len != prop_dst->len))) { - BLI_insertlinkreplace(&dst->data.group, prop_dst, IDP_CopyProperty(prop_src)); + BLI_insertlinkreplace(&dest->data.group, prop_dst, IDP_CopyProperty(prop_src)); IDP_FreeProperty(prop_dst); } else if (prop_dst->type == IDP_GROUP) { @@ -558,7 +558,7 @@ void IDP_SyncGroupTypes(IDProperty *dst, const IDProperty *src, const bool do_ar } } else { - IDP_FreeFromGroup(dst, prop_dst); + IDP_FreeFromGroup(dest, prop_dst); } } } diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index aeb2634b4da..be3795a02b1 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -2970,9 +2970,9 @@ void BKE_image_path_from_imtype(char *string, const char imtype, const bool use_ext, const bool use_frames, - const char *view) + const char *suffix) { - do_makepicstring(string, base, relbase, frame, imtype, NULL, use_ext, use_frames, view); + do_makepicstring(string, base, relbase, frame, imtype, NULL, use_ext, use_frames, suffix); } struct anim *openanim_noload(const char *name, diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index 7304dd91eea..5201faef9cd 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -524,12 +524,12 @@ float (*BKE_lattice_vert_coords_alloc(const Lattice *lt, int *r_vert_len))[3] } void BKE_lattice_vert_coords_apply_with_mat4(struct Lattice *lt, - const float (*vertexCos)[3], + const float (*vert_coords)[3], const float mat[4][4]) { int i, numVerts = lt->pntsu * lt->pntsv * lt->pntsw; for (i = 0; i < numVerts; i++) { - mul_v3_m4v3(lt->def[i].vec, mat, vertexCos[i]); + mul_v3_m4v3(lt->def[i].vec, mat, vert_coords[i]); } } diff --git a/source/blender/blenkernel/intern/lattice_deform.c b/source/blender/blenkernel/intern/lattice_deform.c index 33f7d9851db..919093f3630 100644 --- a/source/blender/blenkernel/intern/lattice_deform.c +++ b/source/blender/blenkernel/intern/lattice_deform.c @@ -453,7 +453,7 @@ void BKE_lattice_deform_coords_with_editmesh(const struct Object *ob_lattice, const int vert_coords_len, const short flag, const char *defgrp_name, - const float influence, + const float fac, struct BMEditMesh *em_target) { lattice_deform_coords_impl(ob_lattice, @@ -462,7 +462,7 @@ void BKE_lattice_deform_coords_with_editmesh(const struct Object *ob_lattice, vert_coords_len, flag, defgrp_name, - influence, + fac, NULL, em_target); } diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index de477ee03b1..fe6f1bd4a97 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -433,21 +433,21 @@ void BKE_mball_properties_copy(Scene *scene, Object *active_object) } } -/** \brief This function finds basic MetaBall. +/** \brief This function finds the basis MetaBall. * - * Basic meta-ball doesn't include any number at the end of + * Basis meta-ball doesn't include any number at the end of * its name. All meta-balls with same base of name can be * blended. meta-balls with different basic name can't be blended. * * \warning #BKE_mball_is_basis() can fail on returned object, see function docs for details. */ -Object *BKE_mball_basis_find(Scene *scene, Object *basis) +Object *BKE_mball_basis_find(Scene *scene, Object *object) { - Object *bob = basis; + Object *bob = object; int basisnr, obnr; char basisname[MAX_ID_NAME], obname[MAX_ID_NAME]; - BLI_split_name_num(basisname, &basisnr, basis->id.name + 2, '.'); + BLI_split_name_num(basisname, &basisnr, object->id.name + 2, '.'); LISTBASE_FOREACH (ViewLayer *, view_layer, &scene->view_layers) { LISTBASE_FOREACH (Base *, base, &view_layer->object_bases) { @@ -460,7 +460,7 @@ Object *BKE_mball_basis_find(Scene *scene, Object *basis) * that it has to have same base of its name. */ if (STREQ(obname, basisname)) { if (obnr < basisnr) { - basis = ob; + object = ob; basisnr = obnr; } } @@ -469,7 +469,7 @@ Object *BKE_mball_basis_find(Scene *scene, Object *basis) } } - return basis; + return object; } bool BKE_mball_minmax_ex( diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 871861c3167..1fcc10f13a9 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -3107,7 +3107,7 @@ void BKE_object_dimensions_set(Object *ob, const float value[3], int axis_mask) BKE_object_dimensions_set_ex(ob, value, axis_mask, NULL, NULL); } -void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool use_hidden) +void BKE_object_minmax(Object *ob, float r_min[3], float r_max[3], const bool use_hidden) { BoundBox bb; float vec[3]; @@ -3118,19 +3118,19 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us case OB_FONT: case OB_SURF: { bb = *BKE_curve_boundbox_get(ob); - BKE_boundbox_minmax(&bb, ob->obmat, min_r, max_r); + BKE_boundbox_minmax(&bb, ob->obmat, r_min, r_max); changed = true; break; } case OB_MESH: { bb = *BKE_mesh_boundbox_get(ob); - BKE_boundbox_minmax(&bb, ob->obmat, min_r, max_r); + BKE_boundbox_minmax(&bb, ob->obmat, r_min, r_max); changed = true; break; } case OB_GPENCIL: { bb = *BKE_gpencil_boundbox_get(ob); - BKE_boundbox_minmax(&bb, ob->obmat, min_r, max_r); + BKE_boundbox_minmax(&bb, ob->obmat, r_min, r_max); changed = true; break; } @@ -3143,7 +3143,7 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us for (v = 0; v < lt->pntsv; v++) { for (u = 0; u < lt->pntsu; u++, bp++) { mul_v3_m4v3(vec, ob->obmat, bp->vec); - minmax_v3v3_v3(min_r, max_r, vec); + minmax_v3v3_v3(r_min, r_max, vec); } } } @@ -3151,7 +3151,7 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us break; } case OB_ARMATURE: { - changed = BKE_pose_minmax(ob, min_r, max_r, use_hidden, false); + changed = BKE_pose_minmax(ob, r_min, r_max, use_hidden, false); break; } case OB_MBALL: { @@ -3159,27 +3159,27 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us changed = BKE_mball_minmax_ex(ob->data, ob_min, ob_max, ob->obmat, 0); if (changed) { - minmax_v3v3_v3(min_r, max_r, ob_min); - minmax_v3v3_v3(min_r, max_r, ob_max); + minmax_v3v3_v3(r_min, r_max, ob_min); + minmax_v3v3_v3(r_min, r_max, ob_max); } break; } case OB_HAIR: { bb = *BKE_hair_boundbox_get(ob); - BKE_boundbox_minmax(&bb, ob->obmat, min_r, max_r); + BKE_boundbox_minmax(&bb, ob->obmat, r_min, r_max); changed = true; break; } case OB_POINTCLOUD: { bb = *BKE_pointcloud_boundbox_get(ob); - BKE_boundbox_minmax(&bb, ob->obmat, min_r, max_r); + BKE_boundbox_minmax(&bb, ob->obmat, r_min, r_max); changed = true; break; } case OB_VOLUME: { bb = *BKE_volume_boundbox_get(ob); - BKE_boundbox_minmax(&bb, ob->obmat, min_r, max_r); + BKE_boundbox_minmax(&bb, ob->obmat, r_min, r_max); changed = true; break; } @@ -3193,15 +3193,15 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us mul_v3_fl(size, ob->empty_drawsize); } - minmax_v3v3_v3(min_r, max_r, ob->obmat[3]); + minmax_v3v3_v3(r_min, r_max, ob->obmat[3]); copy_v3_v3(vec, ob->obmat[3]); add_v3_v3(vec, size); - minmax_v3v3_v3(min_r, max_r, vec); + minmax_v3v3_v3(r_min, r_max, vec); copy_v3_v3(vec, ob->obmat[3]); sub_v3_v3(vec, size); - minmax_v3v3_v3(min_r, max_r, vec); + minmax_v3v3_v3(r_min, r_max, vec); } } diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c index 998e94ff11d..1a35340d7fc 100644 --- a/source/blender/blenkernel/intern/screen.c +++ b/source/blender/blenkernel/intern/screen.c @@ -593,14 +593,14 @@ static void area_region_panels_free_recursive(Panel *panel) MEM_freeN(panel); } -void BKE_area_region_panels_free(ListBase *lb) +void BKE_area_region_panels_free(ListBase *panels) { - LISTBASE_FOREACH_MUTABLE (Panel *, panel, lb) { + LISTBASE_FOREACH_MUTABLE (Panel *, panel, panels) { /* Free custom data just for parent panels to avoid a double free. */ MEM_SAFE_FREE(panel->runtime.custom_data_ptr); area_region_panels_free_recursive(panel); } - BLI_listbase_clear(lb); + BLI_listbase_clear(panels); } /* not region itself */ diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 7897d2bb66e..92c5af127fc 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -4146,13 +4146,13 @@ ImBuf *BKE_sequencer_give_ibuf(const SeqRenderData *context, float cfra, int cha ImBuf *BKE_sequencer_give_ibuf_seqbase(const SeqRenderData *context, float cfra, - int chanshown, + int chan_shown, ListBase *seqbasep) { SeqRenderState state; sequencer_state_init(&state); - return seq_render_strip_stack(context, &state, seqbasep, cfra, chanshown); + return seq_render_strip_stack(context, &state, seqbasep, cfra, chan_shown); } ImBuf *BKE_sequencer_give_ibuf_direct(const SeqRenderData *context, float cfra, Sequence *seq) |