[Bf-blender-cvs] [3bec70ca60b] master: Use custom SWAP macro for swapping userdef data

[Campbell Barton]

Commit: 3bec70ca60bb227cf1b86f588714e2b3edb6be5e
Author: Campbell Barton
Date:   Thu Nov 23 15:18:22 2017 +1100
Branches: master
https://developer.blender.org/rB3bec70ca60bb227cf1b86f588714e2b3edb6be5e

Use custom SWAP macro for swapping userdef data

Avoids complicating the common case

===================================================================

M	source/blender/blenkernel/intern/blender.c

===================================================================

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); \