diff options
| author | Dalai Felinto <dalai@blender.org> | 2020-12-10 13:05:49 +0300 |
|---|---|---|
| committer | Dalai Felinto <dalai@blender.org> | 2020-12-10 13:05:49 +0300 |
| commit | c5a17d5ea1ff786cb91cbcf3f12cd02f730c4143 (patch) | |
| tree | f03a5935ee7dbc4c7ddabaee1c06570a26f698f9 /source/blender/editors/transform/transform_ops.c | |
| parent | 390c4efa0c15b39e2d1971bc81464cffae56d102 (diff) | |
| parent | e795ba1529a28ec276a5178fda2025e5ec071bbf (diff) | |
Merge remote-tracking branch 'origin/master' into geometry-nodes
Diffstat (limited to 'source/blender/editors/transform/transform_ops.c')
| -rw-r--r-- | source/blender/editors/transform/transform_ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c index 7282c35ea0f..5153fdedcae 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -376,7 +376,7 @@ static int transformops_data(bContext *C, wmOperator *op, const wmEvent *event) { int retval = 1; if (op->customdata == NULL) { - TransInfo *t = op->customdata = MEM_callocN(sizeof(TransInfo), "TransInfo data2"); + TransInfo *t = MEM_callocN(sizeof(TransInfo), "TransInfo data2"); TransformModeItem *tmode; int mode = -1; @@ -396,10 +396,10 @@ static int transformops_data(bContext *C, wmOperator *op, const wmEvent *event) /* store data */ if (retval) { G.moving = special_transform_moving(t); + op->customdata = t; } else { MEM_freeN(t); - op->customdata = NULL; } } |