Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-11-23 07:18:22 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-11-23 07:18:22 +0300
commit3bec70ca60bb227cf1b86f588714e2b3edb6be5e (patch)
tree5d4e75eba10b7635d9c9624c9ae61a7df0e5f408
parent326efb431971e668a41d9a331ccc3d11f9fd3e5f (diff)
Use custom SWAP macro for swapping userdef data
Avoids complicating the common case
-rw-r--r--source/blender/blenkernel/intern/blender.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index fdfb4628d1a..af46b6ec852 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -248,7 +248,12 @@ void BKE_blender_userdef_app_template_data_swap(UserDef *userdef_a, UserDef *use
*/
#define DATA_SWAP(id) \
- SWAP(userdef_a->id, userdef_b->id);
+ { \
+ UserDef userdef_tmp; \
+ memcpy(&(userdef_tmp.id), &(userdef_a->id), sizeof(userdef_tmp.id)); \
+ memcpy(&(userdef_a->id), &(userdef_b->id), sizeof(userdef_tmp.id)); \
+ memcpy(&(userdef_b->id), &(userdef_tmp.id), sizeof(userdef_tmp.id)); \
+ }
#define LIST_SWAP(id) { \
SWAP(ListBase, userdef_a->id, userdef_b->id); \