blender
/
blender
134
421
Fork 604
Code Issues 6.4k Pull Requests 765 Projects 19 Wiki Activity

GPv3: Insert grease pencil keyframe from the dopesheet #110649

Merged
Amélie Fondevilla merged 23 commits from amelief/blender:gpv3-insert-keyframe into main 2023-08-02 14:56:24 +02:00
Conversation 1 Commits 23 Files Changed 5 +21 -1
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cd684a813a - Show all commits

22
source/blender/editors/space_action/action_edit.cc
View File

@ -17,6 +17,8 @@
#include "BLT_translation.h"
#include "DEG_depsgraph.h"
#include "DNA_anim_types.h"
#include "DNA_gpencil_legacy_types.h"
#include "DNA_key_types.h"
@ -34,6 +36,8 @@
#include "BKE_fcurve.h"
#include "BKE_global.h"
#include "BKE_gpencil_legacy.h"
#include "BKE_grease_pencil.h"
#include "BKE_grease_pencil.hh"
amelief marked this conversation as resolved Outdated
Falk David commented 2023-08-02 11:43:25 +02:00
Outdated
Review
Copy Link

Don't think this header needs to be included.

Don't think this header needs to be included.
#include "BKE_key.h"
#include "BKE_nla.h"
#include "BKE_report.h"
@ -765,6 +769,22 @@ static void insert_gpencil_key(bAnimContext *ac,
}
}
static void insert_grease_pencil_key(bAnimContext *ac, bAnimListElem *ale)
{
using namespace blender::bke::greasepencil;
Layer *layer = static_cast<Layer *>(ale->data);
GreasePencil *grease_pencil = reinterpret_cast<GreasePencil *>(ale->id);
const int frame_number = ac->scene->r.cfra;
const bool changed = grease_pencil->insert_blank_frame(
*layer, frame_number, 0, BEZT_KEYTYPE_KEYFRAME);
amelief marked this conversation as resolved Outdated
Falk David commented 2023-08-01 12:47:47 +02:00
Outdated
Review
Copy Link

Even if it's a bit longer, I would prefer this to be current_frame_number. Makes the rest more readable imho.

Even if it's a bit longer, I would prefer this to be `current_frame_number`. Makes the rest more readable imho.
if (changed) {
layer->tag_frames_map_keys_changed();
amelief marked this conversation as resolved Outdated
Falk David commented 2023-08-01 12:48:21 +02:00
Outdated
Review
Copy Link

This comment can be removed with the change suggested above.

This comment can be removed with the change suggested above.
DEG_id_tag_update(&grease_pencil->id, ID_RECALC_GEOMETRY);
}
}
static void insert_fcurve_key(bAnimContext *ac,
bAnimListElem *ale,
const AnimationEvalContext anim_eval_context,
@ -864,7 +884,7 @@ static void insert_action_keys(bAnimContext *ac, short mode)
break;
case ANIMTYPE_GREASE_PENCIL_LAYER:
/* GPv3: To be implemented. */
insert_grease_pencil_key(ac, ale);
break;
case ANIMTYPE_FCURVE: