blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Transform: improve safety when restoring data

This commit is contained in:
Germano Cavalcante 2023-01-11 12:08:04 -03:00
parent 3b761901b6
commit ad01cdd7fc
Notes: blender-bot 2023-11-13 23:37:21 +01:00 
Referenced by commit 9dcf73c715, Fix #114787: VSE: canceling move does not reset strip channel
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/transform/transform_generics.c
View File

@ -811,13 +811,15 @@ void applyTransObjects(TransInfo *t)
static void transdata_restore_basic(TransDataBasic *td_basic)
{
/* TransData for crease has no loc */
if (td_basic->loc) {
copy_v3_v3(td_basic->loc, td_basic->iloc);
if (td_basic->val) {
*td_basic->val = td_basic->ival;
}
if (td_basic->val && td_basic->val != td_basic->loc) {
*td_basic->val = td_basic->ival;
/* TODO(mano-wii): Only use 3D or larger vectors in `td->loc`.
* If `loc` and `val` point to the same address, it may indicate that `loc` is not 3D which is
* not safe for `copy_v3_v3`. */
if (td_basic->loc && td_basic->val != td_basic->loc) {
copy_v3_v3(td_basic->loc, td_basic->iloc);
}
}