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/depsgraph | |
| 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/depsgraph')
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_query_iter.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc index d5566e4be98..5788e8efa07 100644 --- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc +++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc @@ -167,7 +167,7 @@ bool deg_iterator_duplis_step(DEGObjectIterData *data) /* Temporary object to evaluate. */ Object *dupli_parent = data->dupli_parent; Object *temp_dupli_object = &data->temp_dupli_object; - *temp_dupli_object = blender::dna::shallow_copy(*dob->ob); + *temp_dupli_object = *dob->ob; temp_dupli_object->base_flag = dupli_parent->base_flag | BASE_FROM_DUPLI; temp_dupli_object->base_local_view_bits = dupli_parent->base_local_view_bits; temp_dupli_object->runtime.local_collections_bits = |