diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-13 06:24:41 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-13 06:25:36 +0300 |
| commit | 184ab749c38a6e90744022a030bec6a6ee584a0a (patch) | |
| tree | c7ed0a96e402dbbd7225447ec3249dce4c1a322b /source/blender/editors/object/object_transform.c | |
| parent | 97062a1b9b2c89a9372b5870418684551b111bab (diff) | |
| parent | fe566a30f3c7ae835c1f2750fb773073b8e40622 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/object/object_transform.c')
| -rw-r--r-- | source/blender/editors/object/object_transform.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index b105102fa6c..6de96aa30ad 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -1100,7 +1100,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op) if (gpd) { if (centermode == ORIGIN_TO_GEOMETRY) { zero_v3(gpcenter); - BKE_gpencil_centroid_3D(gpd, gpcenter); + BKE_gpencil_centroid_3d(gpd, gpcenter); add_v3_v3(gpcenter, ob->obmat[3]); } if (centermode == ORIGIN_TO_CURSOR) { |