use math functions for copying matrix/vector types, also cast const pointers for freeing (clang error's out otherwise)

4 files changed, 7 insertions, 7 deletions

diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c
index 720500d188b..feb18c3babe 100644
--- a/source/blender/blenkernel/intern/editderivedmesh.c
+++ b/source/blender/blenkernel/intern/editderivedmesh.c
@@ -1582,17 +1582,17 @@ static void emDM_release(DerivedMesh *dm)
 
 	if (DM_release(dm)) {
 		if (bmdm->vertexCos) {
-			MEM_freeN(bmdm->vertexCos);
+			MEM_freeN((void *)bmdm->vertexCos);
 			if (bmdm->vertexNos) {
-				MEM_freeN(bmdm->vertexNos);
+				MEM_freeN((void *)bmdm->vertexNos);
 			}
 			if (bmdm->polyNos) {
-				MEM_freeN(bmdm->polyNos);
+				MEM_freeN((void *)bmdm->polyNos);
 			}
 		}
 
 		if (bmdm->polyCos) {
-			MEM_freeN(bmdm->polyCos);
+			MEM_freeN((void *)bmdm->polyCos);
 		}
 
 		MEM_freeN(bmdm);
diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c
index 63c00d5b545..e0268d6b504 100644
--- a/source/blender/bmesh/intern/bmesh_operators.c
+++ b/source/blender/bmesh/intern/bmesh_operators.c
@@ -411,7 +411,7 @@ void BMO_slot_mat_set(BMOperator *op, BMOpSlot slot_args[BMO_OP_MAX_SLOTS], cons
 	slot->data.p = BLI_memarena_alloc(op->arena, sizeof(float) * 4 * 4);
 	
 	if (size == 4) {
-		memcpy(slot->data.p, mat, sizeof(float) * 4 * 4);
+		copy_m4_m4(slot->data.p, (float (*)[4])mat);
 	}
 	else if (size == 3) {
 		copy_m4_m3(slot->data.p, (float (*)[3])mat);
diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c
index d6dc8482ee2..d260312fe3d 100644
--- a/source/blender/modifiers/intern/MOD_simpledeform.c
+++ b/source/blender/modifiers/intern/MOD_simpledeform.c
@@ -262,7 +262,7 @@ static void copyData(ModifierData *md, ModifierData *target)
 	tsmd->axis  = smd->axis;
 	tsmd->origin = smd->origin;
 	tsmd->factor = smd->factor;
-	memcpy(tsmd->limit, smd->limit, sizeof(tsmd->limit));
+	copy_v2_v2(tsmd->limit, smd->limit);
 	BLI_strncpy(tsmd->vgroup_name, smd->vgroup_name, sizeof(tsmd->vgroup_name));
 }
 
diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c
index daf0e5c9dc3..91dcf721e4b 100644
--- a/source/blender/modifiers/intern/MOD_skin.c
+++ b/source/blender/modifiers/intern/MOD_skin.c
@@ -690,7 +690,7 @@ static void build_emats_stack(BLI_Stack *stack, int *visited_e, EMat *emat,
 	/* Add neighbors to stack */
 	for (i = 0; i < emap[v].count; i++) {
 		/* Add neighbors to stack */
-		memcpy(stack_elem.mat, emat[e].mat, sizeof(float) * 3 * 3);
+		copy_m3_m3(stack_elem.mat, emat[e].mat);
 		stack_elem.e = emap[v].indices[i];
 		stack_elem.parent_v = v;
 		BLI_stack_push(stack, &stack_elem);