diff options
| author | Sergey Sharybin <sergey@blender.org> | 2022-03-25 12:57:13 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey@blender.org> | 2022-03-25 12:57:13 +0300 |
| commit | 484af996aa75750c8b419a25b68c9eb8d7efcf19 (patch) | |
| tree | 4e82ec9dead85650ddfae3718a369ea8cd9d54c0 /source/blender/editors/object/object_transform.cc | |
| parent | 8c44793228750537c08ea7b19fc18df0138f9501 (diff) | |
Revert "Implement C++ methods for DNA structures"
This reverts commit 8c44793228750537c08ea7b19fc18df0138f9501.
Apparently, this generated a lot of warnings in GCC.
Didn't find a quick solution and is it not something I want to be
trading between (more quiet Clang in an expense of less quiet GCC).
Will re-iterate on the patch are re-commit it.
Diffstat (limited to 'source/blender/editors/object/object_transform.cc')
| -rw-r--r-- | source/blender/editors/object/object_transform.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_transform.cc b/source/blender/editors/object/object_transform.cc index afd2c048379..24425b5a991 100644 --- a/source/blender/editors/object/object_transform.cc +++ b/source/blender/editors/object/object_transform.cc @@ -1695,13 +1695,13 @@ static void object_apply_rotation(Object *ob, const float rmat[3][3]) static void object_apply_location(Object *ob, const float loc[3]) { /* quick but weak */ - Object ob_prev = blender::dna::shallow_copy(*ob); + Object ob_prev = *ob; float mat[4][4]; copy_m4_m4(mat, ob->obmat); copy_v3_v3(mat[3], loc); BKE_object_apply_mat4(ob, mat, true, true); copy_v3_v3(mat[3], ob->loc); - *ob = blender::dna::shallow_copy(ob_prev); + *ob = ob_prev; copy_v3_v3(ob->loc, mat[3]); } |