diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-18 08:34:47 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-18 08:36:02 +0300 |
commit | 0b5043845113a6af14744677427f63e78e997598 (patch) | |
tree | 780d9c405cef728bb20ffaca2e4976da05a00344 /source/blender/blenkernel | |
parent | e7414723063f50fac2e20b79a76f01ea38019fde (diff) |
Cleanup: move 'orig' into Object_Runtime struct
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object_update.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 9857cb0c547..4db68abf1a8 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2194,10 +2194,10 @@ static void solve_parenting(Object *ob, Object *par, float obmat[4][4], /* origin, for help line */ if (set_origin) { if ((ob->partype & PARTYPE) == PARSKEL) { - copy_v3_v3(ob->orig, par->obmat[3]); + copy_v3_v3(ob->runtime.parent_origin_eval, par->obmat[3]); } else { - copy_v3_v3(ob->orig, totmat[3]); + copy_v3_v3(ob->runtime.parent_origin_eval, totmat[3]); } } } diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c index 0ecb088e57e..b82ff00c656 100644 --- a/source/blender/blenkernel/intern/object_update.c +++ b/source/blender/blenkernel/intern/object_update.c @@ -106,10 +106,10 @@ void BKE_object_eval_parent(Depsgraph *depsgraph, Object *ob) /* origin, for help line */ if ((ob->partype & PARTYPE) == PARSKEL) { - copy_v3_v3(ob->orig, par->obmat[3]); + copy_v3_v3(ob->runtime.parent_origin_eval, par->obmat[3]); } else { - copy_v3_v3(ob->orig, totmat[3]); + copy_v3_v3(ob->runtime.parent_origin_eval, totmat[3]); } } |