diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2022-11-08 20:13:59 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2022-11-08 20:13:59 +0300 |
| commit | e59ebfef3c583985553e78492cf8cd07bbe7648e (patch) | |
| tree | 35f31c3b592f40885baf8d8b078844c92bfbabe7 /source/blender/editors/gpencil/gpencil_data.c | |
| parent | fe7088c99ff084f7218ab20136d49eb1a1dccd0b (diff) | |
| parent | 4c182aef7ce0e8c26dd2b85c1fa2cd45c2ef64ea (diff) | |
Merge branch 'master' into temp-sculpt-brush-channeltemp-sculpt-brush-channel
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_data.c')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_data.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c index c6d7eb294fb..0417694d7bd 100644 --- a/source/blender/editors/gpencil/gpencil_data.c +++ b/source/blender/editors/gpencil/gpencil_data.c @@ -2914,8 +2914,8 @@ int ED_gpencil_join_objects_exec(bContext *C, wmOperator *op) float offset_global[3]; float offset_local[3]; - sub_v3_v3v3(offset_global, ob_active->loc, ob_iter->obmat[3]); - copy_m3_m4(bmat, ob_active->obmat); + sub_v3_v3v3(offset_global, ob_active->loc, ob_iter->object_to_world[3]); + copy_m3_m4(bmat, ob_active->object_to_world); /* Inverse transform for all selected curves in this object, * See #object_join_exec for detailed comment on why the safe version is used. */ |