archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T103463: Repeat last crashes in node editor

Browse Source 
ae886596a0 tried to retrieve keymap data from a null pointer.
This commit is contained in:
Hans Goudey
2022-12-26 10:17:51 -05:00
parent 7be5ca63ae
commit 6b9825e6f7
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/transform/transform.c
View File

@@ -1871,7 +1871,6 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
} }
} }
} }
}
if (t->data_type == &TransConvertType_Node) { if (t->data_type == &TransConvertType_Node) {
/* Set the initial auto-attach flag based on whether the chosen keymap key is pressed at the /* Set the initial auto-attach flag based on whether the chosen keymap key is pressed at the
* start of the operator. */ * start of the operator. */
@@ -1882,7 +1881,8 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
} }
if (kmi->propvalue == TFM_MODAL_NODE_ATTACH_OFF && kmi->val == KM_PRESS) { if (kmi->propvalue == TFM_MODAL_NODE_ATTACH_OFF && kmi->val == KM_PRESS) {
if ((ELEM(kmi->type, EVT_LEFTCTRLKEY, EVT_RIGHTCTRLKEY) && (event->modifier & KM_CTRL)) || if ((ELEM(kmi->type, EVT_LEFTCTRLKEY, EVT_RIGHTCTRLKEY) &&
(event->modifier & KM_CTRL)) ||
(ELEM(kmi->type, EVT_LEFTSHIFTKEY, EVT_RIGHTSHIFTKEY) && (ELEM(kmi->type, EVT_LEFTSHIFTKEY, EVT_RIGHTSHIFTKEY) &&
(event->modifier & KM_SHIFT)) || (event->modifier & KM_SHIFT)) ||
(ELEM(kmi->type, EVT_LEFTALTKEY, EVT_RIGHTALTKEY) && (event->modifier & KM_ALT)) || (ELEM(kmi->type, EVT_LEFTALTKEY, EVT_RIGHTALTKEY) && (event->modifier & KM_ALT)) ||
@@ -1893,6 +1893,7 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
} }
} }
} }
}
initSnapping(t, op); /* Initialize snapping data AFTER mode flags */ initSnapping(t, op); /* Initialize snapping data AFTER mode flags */