diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-12-13 11:50:59 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-12-13 11:55:17 +0300 |
commit | d6ee328c92ad3c77150a31c51981f2eaeaec1792 (patch) | |
tree | 63fa2fa62e89ae784a08e22089a2debb6a1c7cec /source/blender/editors/transform/transform_manipulator.c | |
parent | fd5d4cfeff289764c42a9faf85a38690ae38f18e (diff) |
Cleanup: style/warnings
Diffstat (limited to 'source/blender/editors/transform/transform_manipulator.c')
-rw-r--r-- | source/blender/editors/transform/transform_manipulator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index 74d27fb3068..79b071e6678 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -1624,8 +1624,8 @@ void BIF_draw_manipulator(const bContext *C) case V3D_AROUND_ACTIVE: { bGPdata *gpd = CTX_data_gpencil_data(C); - Object *ob = OBACT; - + Object *ob = OBACT; + if (((v3d->around == V3D_AROUND_ACTIVE) && (scene->obedit == NULL)) && ((gpd == NULL) || !(gpd->flag & GP_DATA_STROKE_EDITMODE)) && (!(ob->mode & OB_MODE_POSE))) |