diff options
| author | Jacques Lucke <jacques@blender.org> | 2022-09-20 14:22:55 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2022-09-20 14:22:55 +0300 |
| commit | 939643741767dbed29b05af2aad93da360932e50 (patch) | |
| tree | 48aaef715bd844fc59054a070bdc5545ae972189 /source/blender/editors | |
| parent | 2b4cb893e7ebb33c24c7413ba0ff10eeb78bddfe (diff) | |
Move workspace.c to C++
Differential Revision: https://developer.blender.org/D16020
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/animation/anim_markers.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_proj.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index 726724181a9..f0b176b85c9 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -1255,14 +1255,14 @@ static int select_timeline_marker_frame(ListBase *markers, deselect_markers(markers); } - LISTBASE_CIRCULAR_FORWARD_BEGIN (markers, marker, marker_cycle_selected) { + LISTBASE_CIRCULAR_FORWARD_BEGIN (TimeMarker *, markers, marker, marker_cycle_selected) { /* this way a not-extend select will always give 1 selected marker */ if (marker->frame == frame) { marker->flag ^= SELECT; break; } } - LISTBASE_CIRCULAR_FORWARD_END(markers, marker, marker_cycle_selected); + LISTBASE_CIRCULAR_FORWARD_END(TimeMarker *, markers, marker, marker_cycle_selected); } return ret_val; diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 2b92f47509e..946a59d0001 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -1233,12 +1233,12 @@ static VertSeam *find_adjacent_seam(const ProjPaintState *ps, LISTBASE_CIRCULAR_BACKWARD_END(VertSeam *, vert_seams, adjacent, seam); } else { - LISTBASE_CIRCULAR_FORWARD_BEGIN (vert_seams, adjacent, seam) { + LISTBASE_CIRCULAR_FORWARD_BEGIN (VertSeam *, vert_seams, adjacent, seam) { if ((adjacent->normal_cw != seam->normal_cw) && cmp_uv(adjacent->uv, seam->uv)) { break; } } - LISTBASE_CIRCULAR_FORWARD_END(vert_seams, adjacent, seam); + LISTBASE_CIRCULAR_FORWARD_END(VertSeam *, vert_seams, adjacent, seam); } BLI_assert(adjacent); |