blender/blender
142
451
Fork 651
Code Issues 6.5k Pull Requests 823 Projects 18 Wiki Activity

GPv3: Frame selected channels for grease pencil #111512

Merged
Falk David merged 1 commits from amelief/blender:gpv3-frame-selected-channels into main 2023-11-16 11:49:44 +01:00
Conversation 0 Commits 1 Files Changed 1 +39
1 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
source/blender/editors/animation/anim_channels_edit.cc
View File

@ -14,6 +14,7 @@
#include "BLI_blenlib.h"
#include "BLI_listbase.h"
#include "BLI_span.hh"
#include "BLI_utildefines.h"
#include "DNA_anim_types.h"
@ -120,6 +121,39 @@ static bool get_gpencil_bounds(bGPDlayer *gpl, const float range[2], rctf *r_bou
return found_start;
}
static bool get_grease_pencil_layer_bounds(const GreasePencilLayer *gplayer,
const float range[2],
rctf *r_bounds)
{
using namespace blender::bke::greasepencil;
const Layer &layer = gplayer->wrap();
bool found_start = false;
int start_frame = 0;
int end_frame = 1;
for (const FramesMapKey key : layer.sorted_keys()) {
if (key < range[0]) {
continue;
}
if (key > range[1]) {
break;
}
if (!found_start) {
start_frame = key;
found_start = true;
}
end_frame = key;
}
r_bounds->xmin = start_frame;
r_bounds->xmax = end_frame;
r_bounds->ymin = 0;
r_bounds->ymax = 1;
return found_start;
}
static bool get_channel_bounds(bAnimContext *ac,
bAnimListElem *ale,
const float range[2],
@ -133,6 +167,11 @@ static bool get_channel_bounds(bAnimContext *ac,
found_bounds = get_gpencil_bounds(gpl, range, r_bounds);
break;
}
case ALE_GREASE_PENCIL_CEL:
found_bounds = get_grease_pencil_layer_bounds(
static_cast<const GreasePencilLayer *>(ale->data), range, r_bounds);
break;
case ALE_FCURVE: {
FCurve *fcu = (FCurve *)ale->key_data;
found_bounds = get_normalized_fcurve_bounds(fcu, ac, ale, include_handles, range, r_bounds);