diff options
| author | Sergey Sharybin <sergey@blender.org> | 2022-04-12 11:56:51 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey@blender.org> | 2022-04-13 12:48:12 +0300 |
| commit | 25c357124de8905360c44a5a842284089ddec341 (patch) | |
| tree | d7f7de7c459d622366ba5b0a7caec720c97f35c7 /source/blender/editors/render | |
| parent | da66c0519fce9bff981370868a359e64198552bc (diff) | |
Cover some DNA files with C++ utility macros
Solves compilation warning with Clang, and moves manipulation with
DNA structures to the designed way for C++.
The tests and few other places are update to the new code by Jacques.
Ref T96847
Maniphest Tasks: T96847
Differential Revision: https://developer.blender.org/D14625
Diffstat (limited to 'source/blender/editors/render')
| -rw-r--r-- | source/blender/editors/render/render_shading.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/render/render_shading.cc b/source/blender/editors/render/render_shading.cc index f5bd60df2b4..46f62354fce 100644 --- a/source/blender/editors/render/render_shading.cc +++ b/source/blender/editors/render/render_shading.cc @@ -2613,7 +2613,7 @@ static void copy_mtex_copybuf(ID *id) } if (mtex && *mtex) { - memcpy(&mtexcopybuf, *mtex, sizeof(MTex)); + mtexcopybuf = blender::dna::shallow_copy(**mtex); mtexcopied = 1; } else { @@ -2649,7 +2649,7 @@ static void paste_mtex_copybuf(ID *id) id_us_min(&(*mtex)->tex->id); } - memcpy(*mtex, &mtexcopybuf, sizeof(MTex)); + **mtex = blender::dna::shallow_copy(mtexcopybuf); id_us_plus((ID *)mtexcopybuf.tex); } |