diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-18 08:31:02 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-18 08:31:02 +0300 |
| commit | e7414723063f50fac2e20b79a76f01ea38019fde (patch) | |
| tree | f5adb932696ca72791f0d9f284a31a992acfd91c /source/blender/blenkernel | |
| parent | cc10d8653575e0d299b330521c98027f1dc8da36 (diff) | |
Cleanup: remove 'orig' from ObTfmBack
This is runtime data and is re-evaluated before use.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 617b5f580b1..9857cb0c547 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2725,9 +2725,9 @@ void BKE_scene_foreach_display_point( /* copied from DNA_object_types.h */ typedef struct ObTfmBack { - float loc[3], dloc[3], orig[3]; + float loc[3], dloc[3]; /** scale and delta scale. */ - float size[3], dscale[3]; + float scale[3], dscale[3]; /** euler rotation. */ float rot[3], drot[3]; /** quaternion rotation. */ @@ -2751,8 +2751,7 @@ void *BKE_object_tfm_backup(Object *ob) ObTfmBack *obtfm = MEM_mallocN(sizeof(ObTfmBack), "ObTfmBack"); copy_v3_v3(obtfm->loc, ob->loc); copy_v3_v3(obtfm->dloc, ob->dloc); - copy_v3_v3(obtfm->orig, ob->orig); - copy_v3_v3(obtfm->size, ob->scale); + copy_v3_v3(obtfm->scale, ob->scale); copy_v3_v3(obtfm->dscale, ob->dscale); copy_v3_v3(obtfm->rot, ob->rot); copy_v3_v3(obtfm->drot, ob->drot); @@ -2775,8 +2774,7 @@ void BKE_object_tfm_restore(Object *ob, void *obtfm_pt) ObTfmBack *obtfm = (ObTfmBack *)obtfm_pt; copy_v3_v3(ob->loc, obtfm->loc); copy_v3_v3(ob->dloc, obtfm->dloc); - copy_v3_v3(ob->orig, obtfm->orig); - copy_v3_v3(ob->scale, obtfm->size); + copy_v3_v3(ob->scale, obtfm->scale); copy_v3_v3(ob->dscale, obtfm->dscale); copy_v3_v3(ob->rot, obtfm->rot); copy_v3_v3(ob->drot, obtfm->drot); |