blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix: "Twist" GP Sculpt brush in 2D Editors was unusable... now mostly usable, if still slightly offset

This commit is contained in:
Joshua Leung 2016-02-27 01:11:37 +13:00
parent 6d672a566c
commit 5cec0e6faf
Notes: blender-bot 2023-02-14 08:10:06 +01:00 
Referenced by issue #47604, Sculpt mode: Modifiers will bug out when you press undo (most obviously solidify and subsurf)
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source/blender/editors/gpencil/gpencil_brush.c
View File

@ -606,24 +606,32 @@ static bool gp_brush_twist_apply(tGP_BrushEditData *gso, bGPDstroke *gps, int i,
add_v3_v3v3(&pt->x, vec, gso->dvec); /* restore */
}
else {
float tco[2], rco[2], nco[2];
float rmat[2][2];
const float axis[3] = {0.0f, 0.0f, 1.0f};
float vec[3] = {0.0f};
float rmat[3][3];
/* Express position of point relative to cursor, ready to rotate */
tco[0] = (float)(co[0] - gso->mval[0]);
tco[1] = (float)(co[1] - gso->mval[1]);
// XXX: There is still some offset here, but it's close to working as expected...
vec[0] = (float)(co[0] - gso->mval[0]);
vec[1] = (float)(co[1] - gso->mval[1]);
/* Rotate point in 2D */
angle_to_mat2(rmat, angle);
mul_v2_m2v2(rco, rmat, tco);
/* rotate point */
axis_angle_normalized_to_mat3(rmat, axis, angle);
mul_m3_v3(rmat, vec);
/* Convert back to screen-coordinates */
nco[0] = rco[0] + (float)gso->mval[0];
nco[1] = rco[1] + (float)gso->mval[1];
vec[0] += (float)gso->mval[0];
vec[1] += (float)gso->mval[1];
/* Use coordinates "as-is" */
// XXX: v2d scaling/offset?
copy_v2_v2(&pt->x, nco);
/* Map from screen-coordinates to final coordinate space */
if (gps->flag & GP_STROKE_2DSPACE) {
View2D *v2d = gso->gsc.v2d;
UI_view2d_region_to_view(v2d, vec[0], vec[1], &pt->x, &pt->y);
}
else {
// XXX
copy_v2_v2(&pt->x, vec);
}
}
/* done */