diff options
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/CCGSubSurf.c | 24 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/CCGSubSurf.h | 15 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/camera.c | 18 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/curve.c | 14 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/deform.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/fluid.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/idprop.c | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/image.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/lattice.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/lattice_deform.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mball.c | 14 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 28 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/screen.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 4 |
15 files changed, 79 insertions, 76 deletions
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) |