diff options
| author | Antonioya <blendergit@gmail.com> | 2019-01-04 19:01:39 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2019-01-04 19:01:39 +0300 |
| commit | 38796a4971afdd58e58bcfe043fbdb21153dfcc2 (patch) | |
| tree | 12beff1531e3f62d511f3396c45bb9563439f237 | |
| parent | 6c878c5d3ca466fb6b7dd8894f8c2565b8e6d223 (diff) | |
Fix T59546: Grease Pencil Edit: Rotation around individual origins error
Thanks to Habib Gahbiche (@zazizizou) for helping fixing this bug. See D4156.
| -rw-r--r-- | source/blender/editors/transform/transform.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_generics.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index f7a27571b64..2b2de65db15 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -223,7 +223,7 @@ static bool transdata_check_local_center(TransInfo *t, short around) return ((around == V3D_AROUND_LOCAL_ORIGINS) && ( (t->flag & (T_OBJECT | T_POSE)) || /* implicit: (t->flag & T_EDIT) */ - (ELEM(t->obedit_type, OB_MESH, OB_CURVE, OB_MBALL, OB_ARMATURE)) || + (ELEM(t->obedit_type, OB_MESH, OB_CURVE, OB_MBALL, OB_ARMATURE, OB_GPENCIL)) || (t->spacetype == SPACE_IPO) || (t->options & (CTX_MOVIECLIP | CTX_MASK | CTX_PAINT_CURVE))) ); diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 1d63291d313..47624293a0b 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -8588,7 +8588,7 @@ void createTransData(bContext *C, TransInfo *t) } else if (t->options & CTX_GPENCIL_STROKES) { t->options |= CTX_GPENCIL_STROKES; - t->flag |= T_POINTS; + t->flag |= T_POINTS | T_EDIT; initTransDataContainers_FromObjectData(t, ob, NULL, 0); createTransGPencil(C, t); diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 882ef9e7301..8ae23737e5e 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1292,7 +1292,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve t->flag = 0; - t->obedit_type = (object_mode == OB_MODE_EDIT) ? object_type : -1; + t->obedit_type = ((object_mode == OB_MODE_EDIT) || (object_mode == OB_MODE_EDIT_GPENCIL)) ? object_type : -1; /* Many kinds of transform only use a single handle. */ if (t->data_container == NULL) { |