griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #116342: crash when moving GP3 keyframe

Browse Source 
Caused by 7f626e08e1

It is necessary to use a safer way to identify whether `TransData2D`
points to an int value.
This commit is contained in:
Germano Cavalcante
2023-12-19 17:19:02 -03:00
parent c9fc69d10b
commit 9fbc096522
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/blender/editors/transform/transform_convert_action.cc
View File

@@ -38,11 +38,11 @@
#include "transform_convert.hh"
/* Weak way of identifying whether TransData was set by #GPLayerToTransData or
* #MaskLayerToTransData. This way we can identify whether the #td->extra is a pointer to an
* integer value and we can correctly flush the #recalcData_actedit. */
static bool data_is_gp_or_mask(TransData *td, TransData2D *td2d)
* #MaskLayerToTransData. This way we can identify whether the #td->loc2d_i is a pointer to an
* integer value and we can correctly flush in #recalcData_actedit. */
static bool is_td2d_int(TransData2D *td2d)
{
return td->extra && !td2d->loc2d;
return td2d->loc2d_i && td2d->h1 == nullptr;
}
/* -------------------------------------------------------------------- */
@@ -349,7 +349,7 @@ static void TimeToTransData(
/* Set flags to move handles as necessary. */
td->flag |= TD_MOVEHANDLE1 | TD_MOVEHANDLE2;
BLI_assert(!data_is_gp_or_mask(td, td2d));
BLI_assert(!is_td2d_int(td2d));
}
/* This function advances the address to which td points to, so it must return
@@ -419,6 +419,7 @@ static int GPLayerToTransData(TransData *td,
if (is_prop_edit || is_selected) {
if (FrameOnMouseSide(side, float(gpf->framenum), cfra)) {
td2d->loc[0] = float(gpf->framenum);
td2d->loc2d_i = &gpf->framenum;
td->loc = td->val = td2d->loc;
td->iloc[0] = td->ival = td2d->loc[0];
@@ -426,14 +427,11 @@ static int GPLayerToTransData(TransData *td,
td->center[0] = td->ival;
td->center[1] = ypos;
/* Store the int value in #td->extra, so we can flush later. */
td->extra = &gpf->framenum;
if (is_selected) {
td->flag = TD_SELECTED;
}
BLI_assert(data_is_gp_or_mask(td, td2d));
BLI_assert(is_td2d_int(td2d));
/* Advance `td` now. */
td++;
@@ -492,7 +490,7 @@ static int GreasePencilLayerToTransData(TransData *td,
td->flag |= TD_GREASE_PENCIL_FRAME;
td->extra = layer;
BLI_assert(!data_is_gp_or_mask(td, td2d));
BLI_assert(!is_td2d_int(td2d));
/* Advance `td` now. */
td++;
@@ -537,6 +535,7 @@ static int MaskLayerToTransData(TransData *td,
if (is_prop_edit || (masklay_shape->flag & MASK_SHAPE_SELECT)) {
if (FrameOnMouseSide(side, float(masklay_shape->frame), cfra)) {
td2d->loc[0] = float(masklay_shape->frame);
td2d->loc2d_i = &masklay_shape->frame;
td->loc = td->val = td2d->loc;
td->iloc[0] = td->ival = td2d->loc[0];
@@ -544,10 +543,7 @@ static int MaskLayerToTransData(TransData *td,
td->center[0] = td->ival;
td->center[1] = ypos;
/* Store the int value in #td->extra, so we can flush later. */
td->extra = &masklay_shape->frame;
BLI_assert(data_is_gp_or_mask(td, td2d));
BLI_assert(is_td2d_int(td2d));
/* advance td now */
td++;
@@ -940,10 +936,10 @@ static void recalcData_actedit(TransInfo *t)
round_fl_to_int(td2d->loc[0]),
use_duplicated);
}
else if (data_is_gp_or_mask(td, td2d)) {
else if (is_td2d_int(td2d)) {
/* (Grease Pencil Legacy)
* This helps flush transdata written to tempdata into the gp-frames. */
*reinterpret_cast<int *>(td->extra) = round_fl_to_int(td2d->loc[0]);
*td2d->loc2d_i = round_fl_to_int(td2d->loc[0]);
}
}

8
source/blender/editors/transform/transform_data.hh
View File

@@ -96,9 +96,11 @@ struct TransDataExtension {
struct TransData2D {
/** Location of data used to transform (x,y,0). */
float loc[3];
/** Pointer to real 2d location of data. */
float *loc2d;
union {
/** Pointer to real 2d location of data. */
float *loc2d;
int *loc2d_i;
};
/** Pointer to handle locations, if handles aren't being moved independently. */
float *h1, *h2;
float ih1[2], ih2[2];